]> git.decadent.org.uk Git - dak.git/commit
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)
commitc67a020603dc26499b8d9b6ba3d5469fdcbb2567
treeb087d13828b59b81fba192b03362f42f2219f890
parent010895777842727186f4e1f8e9c50f9fe19281d2
parentcccc15df9f84daa59b30ec32a91d3cfb4cbb8d21
Merge commit 'ftpmaster/master'

Conflicts:

dak/init_db.py

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