]> git.decadent.org.uk Git - dak.git/commit
Merge branch 'master' into bugfixes
authorRaphael Hertzog <hertzog@debian.org>
Tue, 7 Apr 2009 06:52:12 +0000 (08:52 +0200)
committerRaphael Hertzog <hertzog@debian.org>
Tue, 7 Apr 2009 06:57:45 +0000 (08:57 +0200)
commit425e44739cd77ffa01294f23e94ae7eabd5f5ec8
tree5c59892fec86f4a82338064684f11518302d848d
parent3670b5f49b4d70a8eaf7ac24f50a541c9286fde2
parent459c6eaf4425915f363530216cd239fe9d8d0f9d
Merge branch 'master' into bugfixes

Conflicts:
dak/init_db.py
dak/init_db.py