]> git.decadent.org.uk Git - dak.git/commit
Merge branch 'master' into contents
authorTorsten Werner <twerner@debian.org>
Thu, 24 Mar 2011 08:35:23 +0000 (09:35 +0100)
committerTorsten Werner <twerner@debian.org>
Thu, 24 Mar 2011 08:35:23 +0000 (09:35 +0100)
commit64763c8d5153817bf68e07f2fb34f0d1870a1dc0
tree8dbf1dd882b83399f5239cbcd1522df429bb4cac
parent28989cfb6aed1278147476aebb7121f12c45bc7f
parentc757aaa7d63b4508ad353a2339507ed837a8e0a3
Merge branch 'master' into contents

Conflicts:
daklib/dbconn.py
daklib/dbconn.py