chiark / gitweb /
Merge commit 'sledge/master'
authorPeter Palfrader <peter@palfrader.org>
Wed, 21 Apr 2010 14:40:34 +0000 (16:40 +0200)
committerPeter Palfrader <peter@palfrader.org>
Wed, 21 Apr 2010 14:40:34 +0000 (16:40 +0200)
commit8938fe9932de5e685922a87bb3d14bc0ca50838a
tree6043e30382a761af08987978be08e1a1605e4659
parenta05dd9f1aa349a0d1164ca63453b18c81cdb973b
parent1a85588d56434995edef34822cd3693f41167ef4
Merge commit 'sledge/master'

* commit 'sledge/master':
  Add depends on zip for the CD builder
  Merge branches 'master' and 'master' of git+ssh://git.debian.org/git/mirror/debian.org

Signed-off-by: Peter Palfrader <peter@palfrader.org>
debian/control