From: Torsten Werner <twerner@debian.org>
Date: Mon, 21 Mar 2011 17:21:16 +0000 (+0100)
Subject: Merge branch 'master' into dbtests
X-Git-Tag: debian-r/squeeze~282
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=8c93e61298c8d126f9ceb7cdab49ae6354de74f5;p=dak.git

Merge branch 'master' into dbtests

Conflicts:
	dak/update_db.py

Signed-off-by: Torsten Werner <twerner@debian.org>
---

8c93e61298c8d126f9ceb7cdab49ae6354de74f5