From: Mark Hymers <mhy@debian.org>
Date: Sat, 9 Apr 2011 08:42:22 +0000 (+0100)
Subject: Merge remote branch 'ftpmaster/master' into multiproc
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=475051efae41a30723cdc1ab82c521cd1accf75b;hp=475051efae41a30723cdc1ab82c521cd1accf75b;p=dak.git

Merge remote branch 'ftpmaster/master' into multiproc

Conflicts:
	dak/show_new.py

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