From: Don Armstrong <don@donarmstrong.com>
Date: Tue, 11 Nov 2014 23:34:34 +0000 (-0800)
Subject: Merge branch 'master' into debian-r
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=d5f1282c25d4c3cef798807c91a66d77bca15961;p=dak.git

Merge branch 'master' into debian-r

Conflicts:
	dak/generate_packages_sources2.py
	dak/generate_releases.py
	docs/README.first
---

d5f1282c25d4c3cef798807c91a66d77bca15961