From: Ansgar Burchardt <ansgar@debian.org>
Date: Sun, 4 Sep 2011 12:53:45 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master' into description-md5
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=d0328e7b4d2dc5baf38f7dd66eb9d6c5bcf5b55e;p=dak.git

Merge remote-tracking branch 'origin/master' into description-md5

Conflicts:
	dak/update_db.py
---

d0328e7b4d2dc5baf38f7dd66eb9d6c5bcf5b55e