From: Philipp Kern <pkern@debian.org>
Date: Sun, 7 Sep 2008 14:33:11 +0000 (+0000)
Subject: Merge branch 'master' of ftpmaster's dak repository
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=e79e9a1395528354b5978fc4b92a8fcdd1559d70;hp=e79e9a1395528354b5978fc4b92a8fcdd1559d70;p=dak.git

Merge branch 'master' of ftpmaster's dak repository

Conflicts:

	ChangeLog
---