]> git.decadent.org.uk Git - dak.git/commit
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)
commiteb2da389bb3f5ebb711940c244010f7cd7bba32a
tree3ccc554bba50d4b5992390550491149c76903486
parent250fb82d468dcd488cad753b7c624e5a6436a358
parentc99238db49e49f53712fcd992c85f03c9c503715
Merge commit 'ftpmaster/master'

Conflicts:

dak/check_archive.py

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