]> git.decadent.org.uk Git - dak.git/commitdiff
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)
Conflicts:
daklib/dbconn.py

Signed-off-by: Mark Hymers <mhy@debian.org>

No differences found