]> git.decadent.org.uk Git - dak.git/commitdiff
Merge commit 'ftpmaster/master'
authorMark Hymers <mhy@debian.org>
Sat, 14 Mar 2009 15:53:41 +0000 (15:53 +0000)
committerMark Hymers <mhy@debian.org>
Sat, 14 Mar 2009 15:53:41 +0000 (15:53 +0000)
Conflicts:

dak/init_db.py

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

Trivial merge