]> err.no Git - dak/commitdiff
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)
Conflicts:
dak/update_db.py

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

Simple merge
diff --cc daklib/queue.py
Simple merge