From: Torsten Werner <twerner@debian.org>
Date: Thu, 3 Mar 2011 22:49:50 +0000 (+0100)
Subject: Merge branch 'master' into dbtests
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=d86fdc088f029bb7ebfd7b1e91a178f9efdc6650;hp=d86fdc088f029bb7ebfd7b1e91a178f9efdc6650;p=dak.git

Merge branch 'master' into dbtests

Conflicts:
	tests/dbtest_contents.py
---