]> err.no Git - dak/commit
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)
commit8d96479bcfd210f9cf8f5692b2982d3c3a08ba5c
tree0becdfb5cf6ac4589533dbf9f8d33c2f081f0676
parent02dbaf8a98f544586ed4cd4f375965cf2484dae0
parentc60216732d70ba63ebd59858070fd07d7e17ab77
Merge remote-tracking branch 'origin/master' into version-checks

Conflicts:
dak/update_db.py
daklib/dbconn.py
daklib/queue.py