]> err.no Git - dak/commit
Merge commit 'ftpmaster/master'
authorMark Hymers <mhy@debian.org>
Sat, 31 Oct 2009 09:17:48 +0000 (09:17 +0000)
committerMark Hymers <mhy@debian.org>
Sat, 31 Oct 2009 09:17:48 +0000 (09:17 +0000)
commit945c33a367afa0e69f3aa8b4d087deb6356d8931
tree844d4aa460a2cdf11bff23ef0c12b53d097ebef9
parent0b38b655a1f91653b66589e43880cea0d1b74157
parentbcb7c250fc94b6568c920e41281d44d05f705556
Merge commit 'ftpmaster/master'

Conflicts:
daklib/dbconn.py

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