]> err.no Git - dak/commitdiff
Merge remote-tracking branch 'origin/master' into version-checks
authorAnsgar Burchardt <ansgar@debian.org>
Thu, 24 Mar 2011 19:33:06 +0000 (20:33 +0100)
committerAnsgar Burchardt <ansgar@debian.org>
Thu, 24 Mar 2011 19:33:06 +0000 (20:33 +0100)
Conflicts:
dak/update_db.py

1  2 
daklib/dbconn.py
daklib/queue.py

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