From: Mark Hymers <mhy@debian.org>
Date: Sat, 14 Mar 2009 15:53:41 +0000 (+0000)
Subject: Merge commit 'ftpmaster/master'
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=c67a020603dc26499b8d9b6ba3d5469fdcbb2567;p=dak.git

Merge commit 'ftpmaster/master'

Conflicts:

	dak/init_db.py

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

c67a020603dc26499b8d9b6ba3d5469fdcbb2567