From: Peter Palfrader <peter@palfrader.org>
Date: Wed, 21 Apr 2010 14:40:34 +0000 (+0200)
Subject: Merge commit 'sledge/master'
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=8938fe9932de5e685922a87bb3d14bc0ca50838a;p=dsa-metapackages.git

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>
---

8938fe9932de5e685922a87bb3d14bc0ca50838a