]> err.no Git - dak/commit
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)
commit99749f86a3ca945f6f9f322f5694255e47ee7809
treea33bde76773f22658d7ebd0e94c5d01d61eaa3c3
parent8d2c584e078a628f7c510b0b375bfb23fc027d5f
parente6a26ca720356e214b73b834e02ff94d3b873862
Merge remote branch 'ftpmaster/master' into multiproc

Conflicts:
dak/generate_packages_sources2.py

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