]> git.decadent.org.uk Git - dak.git/commit
Merge branch 'master' into dbtests
authorTorsten Werner <twerner@debian.org>
Mon, 21 Mar 2011 17:21:16 +0000 (18:21 +0100)
committerTorsten Werner <twerner@debian.org>
Mon, 21 Mar 2011 17:22:18 +0000 (18:22 +0100)
commit8c93e61298c8d126f9ceb7cdab49ae6354de74f5
tree0e0b927101dd4597ef8c3f2c9d7c29bb14fb616b
parent79435b6fcb5a7e543642a489062ed1d044eb7624
parent06d8add07fc0757695f04f71067202603aa6d5fc
Merge branch 'master' into dbtests

Conflicts:
dak/update_db.py

Signed-off-by: Torsten Werner <twerner@debian.org>
daklib/dbconn.py
daklib/queue.py