]> git.decadent.org.uk Git - dak.git/commitdiff
Merge branch 'master' into auto-decruft-passive
authorNiels Thykier <niels@thykier.net>
Thu, 11 Jun 2015 11:36:04 +0000 (13:36 +0200)
committerNiels Thykier <niels@thykier.net>
Thu, 11 Jun 2015 11:36:04 +0000 (13:36 +0200)
Conflicts:
dak/generate_filelist.py


No differences found