From: Torsten Werner <twerner@debian.org>
Date: Thu, 24 Mar 2011 08:35:23 +0000 (+0100)
Subject: Merge branch 'master' into contents
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=64763c8d5153817bf68e07f2fb34f0d1870a1dc0;hp=64763c8d5153817bf68e07f2fb34f0d1870a1dc0;p=dak.git

Merge branch 'master' into contents

Conflicts:
	daklib/dbconn.py
---