From: Mark Hymers <mhy@debian.org>
Date: Sat, 7 May 2011 12:35:26 +0000 (+0100)
Subject: Merge remote branch 'ftpmaster/master' into multiproc
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=99749f86a3ca945f6f9f322f5694255e47ee7809;hp=99749f86a3ca945f6f9f322f5694255e47ee7809;p=dak.git

Merge remote branch 'ftpmaster/master' into multiproc

Conflicts:
	dak/generate_packages_sources2.py

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