Merge remote-tracking branch 'origin/master' into version-checks

author Ansgar Burchardt <ansgar@debian.org>

Thu, 24 Mar 2011 19:33:06 +0000 (20:33 +0100)

committer Ansgar Burchardt <ansgar@debian.org>

Thu, 24 Mar 2011 19:33:06 +0000 (20:33 +0100)
author Ansgar Burchardt <ansgar@debian.org>
Thu, 24 Mar 2011 19:33:06 +0000 (20:33 +0100)
committer Ansgar Burchardt <ansgar@debian.org>
Thu, 24 Mar 2011 19:33:06 +0000 (20:33 +0100)
diff --cc daklib/dbconn.py
Simple merge
diff --cc daklib/queue.py
Simple merge
author	Ansgar Burchardt <ansgar@debian.org>
	Thu, 24 Mar 2011 19:33:06 +0000 (20:33 +0100)
committer	Ansgar Burchardt <ansgar@debian.org>
	Thu, 24 Mar 2011 19:33:06 +0000 (20:33 +0100)
		1	2
daklib/dbconn.py	patch \|	diff1 \|	diff2 \|	blob \| history
daklib/queue.py	patch \|	diff1 \|	diff2 \|	blob \| history