]> git.decadent.org.uk Git - dak.git/commitdiff
Merge remote branch 'ftpmaster/master' into multiproc
authorMark Hymers <mhy@debian.org>
Sat, 7 May 2011 12:35:26 +0000 (13:35 +0100)
committerMark Hymers <mhy@debian.org>
Sat, 7 May 2011 12:35:26 +0000 (13:35 +0100)
Conflicts:
dak/generate_packages_sources2.py

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

No differences found