]> git.decadent.org.uk Git - dak.git/commitdiff
Merge commit 'ftpmaster/master'
authorMark Hymers <mhy@debian.org>
Thu, 12 Feb 2009 21:42:04 +0000 (21:42 +0000)
committerMark Hymers <mhy@debian.org>
Thu, 12 Feb 2009 21:42:04 +0000 (21:42 +0000)
Conflicts:

dak/check_archive.py

Signed-off-by: Mark Hymers <mhy@debian.org>

Trivial merge