]> err.no Git - dak/commit
Merge remote branch 'ftpmaster/master' into override-cs-db
authorMark Hymers <mhy@debian.org>
Sun, 4 Sep 2011 18:17:03 +0000 (19:17 +0100)
committerMark Hymers <mhy@debian.org>
Sun, 4 Sep 2011 18:17:03 +0000 (19:17 +0100)
commite939620de1f925def64465f20f1f2320f092d967
tree4a0cc3d07f1b6b94a000d94d43763144e57c040a
parent64afccd0bc891c871958d44065c80e93062758f1
parentdf984f92931b276da9e3ddb0b2fb6e7dc05d91d6
Merge remote branch 'ftpmaster/master' into override-cs-db

Conflicts:
dak/dakdb/update69.py

Signed-off-by: Mark Hymers <mhy@debian.org>
dak/control_suite.py
dak/dakdb/update70.py