]> git.decadent.org.uk Git - dak.git/commitdiff
Merge remote branch 'ftpmaster/master'
authorMark Hymers <mhy@debian.org>
Wed, 10 Aug 2011 19:59:27 +0000 (20:59 +0100)
committerMark Hymers <mhy@debian.org>
Wed, 10 Aug 2011 19:59:27 +0000 (20:59 +0100)
1  2 
daklib/dbconn.py

Simple merge