Merge branch 'master' into pu/backports-merge

author Ansgar Burchardt <ansgar@debian.org>

Mon, 17 Sep 2012 14:27:33 +0000 (16:27 +0200)

committer Ansgar Burchardt <ansgar@debian.org>

Mon, 17 Sep 2012 14:27:33 +0000 (16:27 +0200)
author Ansgar Burchardt <ansgar@debian.org>
Mon, 17 Sep 2012 14:27:33 +0000 (16:27 +0200)
committer Ansgar Burchardt <ansgar@debian.org>
Mon, 17 Sep 2012 14:27:33 +0000 (16:27 +0200)
diff --cc daklib/config.py
Simple merge
diff --cc daklib/utils.py
Simple merge
author	Ansgar Burchardt <ansgar@debian.org>
	Mon, 17 Sep 2012 14:27:33 +0000 (16:27 +0200)
committer	Ansgar Burchardt <ansgar@debian.org>
	Mon, 17 Sep 2012 14:27:33 +0000 (16:27 +0200)
		1	2
daklib/config.py	patch \|	diff1 \|	diff2 \|	blob \| history
daklib/utils.py	patch \|	diff1 \|	diff2 \|	blob \| history