chiark / gitweb /
~ianmdlvl / dsa-metapackages.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a05dd9f 1a85588)
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)
* 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>
1  2 
debian/control patch | diff1 | diff2 | blob | history

diff --cc debian/control
Simple merge
Unnamed repository; edit this file 'description' to name the repository.