From: Ansgar Burchardt <ansgar@debian.org>
Date: Wed, 24 Aug 2011 12:34:13 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master' into auditpackages
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=4c6d9d52eddb26028e5328e30c2d312bc45f3906;p=dak.git

Merge remote-tracking branch 'origin/master' into auditpackages

Conflicts:
	dak/update_db.py
---

4c6d9d52eddb26028e5328e30c2d312bc45f3906