err.no Git - dak/commit

]> err.no Git - dak/commit

projects / dak / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 64afccd df984f9)

author	Mark Hymers <mhy@debian.org>
	Sun, 4 Sep 2011 18:17:03 +0000 (19:17 +0100)
committer	Mark Hymers <mhy@debian.org>
	Sun, 4 Sep 2011 18:17:03 +0000 (19:17 +0100)
commit	e939620de1f925def64465f20f1f2320f092d967
tree	4a0cc3d07f1b6b94a000d94d43763144e57c040a	tree \| snapshot
parent	64afccd0bc891c871958d44065c80e93062758f1	commit \| diff
parent	df984f92931b276da9e3ddb0b2fb6e7dc05d91d6	commit \| diff

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	diff1 \|	diff2 \|	blob \| history
dak/dakdb/update70.py	\|	\|	blob

Unnamed repository; edit this file 'description' to name the repository.