]> err.no Git - dak/commit
Merge remote branch 'ftpmaster/master' into multiproc
authorMark Hymers <mhy@debian.org>
Sat, 9 Apr 2011 08:42:22 +0000 (09:42 +0100)
committerMark Hymers <mhy@debian.org>
Sat, 9 Apr 2011 08:42:22 +0000 (09:42 +0100)
commit475051efae41a30723cdc1ab82c521cd1accf75b
tree5570cb4dbb3e21e2742d1b264095982b500c95ba
parente2baddaa67c0f22d42aff35dde78f09c72ab63a5
parent94b406d8543e05b1d3233b7f0e0d104344378396
Merge remote branch 'ftpmaster/master' into multiproc

Conflicts:
dak/show_new.py

Signed-off-by: Mark Hymers <mhy@debian.org>
dak/generate_packages_sources2.py
dak/generate_releases.py
dak/show_new.py