Merge remote-tracking branch 'origin/master' into description-md5

author Ansgar Burchardt <ansgar@debian.org>

Sun, 4 Sep 2011 12:53:45 +0000 (14:53 +0200)

committer Ansgar Burchardt <ansgar@debian.org>

Sun, 4 Sep 2011 12:53:45 +0000 (14:53 +0200)
author Ansgar Burchardt <ansgar@debian.org>
Sun, 4 Sep 2011 12:53:45 +0000 (14:53 +0200)
committer Ansgar Burchardt <ansgar@debian.org>
Sun, 4 Sep 2011 12:53:45 +0000 (14:53 +0200)
diff --cc dak/update_db.py
Simple merge
diff --cc daklib/filewriter.py
Simple merge
author	Ansgar Burchardt <ansgar@debian.org>
	Sun, 4 Sep 2011 12:53:45 +0000 (14:53 +0200)
committer	Ansgar Burchardt <ansgar@debian.org>
	Sun, 4 Sep 2011 12:53:45 +0000 (14:53 +0200)
		1	2
dak/update_db.py	patch \|	diff1 \|	diff2 \|	blob \| history
daklib/filewriter.py	patch \|	diff1 \|	diff2 \|	blob \| history