From: Mark Hymers <mhy@debian.org>
Date: Thu, 12 Feb 2009 21:42:04 +0000 (+0000)
Subject: Merge commit 'ftpmaster/master'
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=eb2da389bb3f5ebb711940c244010f7cd7bba32a;hp=-c;p=dak.git

Merge commit 'ftpmaster/master'

Conflicts:

	dak/check_archive.py

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

eb2da389bb3f5ebb711940c244010f7cd7bba32a