From: Mark Hymers <mhy@debian.org>
Date: Sat, 24 Jan 2009 19:13:26 +0000 (+0000)
Subject: Merge commit 'ftpmaster/master' into regexes
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=cdffcfe2a0e6804ed35df56c4c2aa084c2b63677;hp=cdffcfe2a0e6804ed35df56c4c2aa084c2b63677;p=dak.git

Merge commit 'ftpmaster/master' into regexes

Conflicts:

	dak/make_maintainers.py
	dak/new_security_install.py
	dak/process_accepted.py

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