From: Niels Thykier <niels@thykier.net>
Date: Thu, 11 Jun 2015 11:36:04 +0000 (+0200)
Subject: Merge branch 'master' into auto-decruft-passive
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=321e39b64490fb825769f7ed9f6534cebeedd923;p=dak.git

Merge branch 'master' into auto-decruft-passive

Conflicts:
	dak/generate_filelist.py
---

321e39b64490fb825769f7ed9f6534cebeedd923