]> err.no Git - dak/commit
Merge remote branch 'ftpmaster/master' into psimport
authorMark Hymers <mhy@debian.org>
Wed, 23 Mar 2011 18:33:54 +0000 (18:33 +0000)
committerMark Hymers <mhy@debian.org>
Wed, 23 Mar 2011 18:33:54 +0000 (18:33 +0000)
commitb8690d6b1256a4a95198b874d9eb1aab62a825fb
tree034e1b30c91c2aa155841d33cff1df5de0186176
parentf265a8e0edb2e2cb097d237a62a58dab0598583e
parent76467b7e0ddd35e882cf8ac0ddf3b56c3739315b
Merge remote branch 'ftpmaster/master' into psimport

Conflicts:
daklib/dbconn.py

Signed-off-by: Mark Hymers <mhy@debian.org>
daklib/dbconn.py