]> git.decadent.org.uk Git - dak.git/commit
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)
commit321e39b64490fb825769f7ed9f6534cebeedd923
tree0133a153a198a269b33780095ed495fde68f46c3
parent7d548bdf9a43db4d42bf5623f2acc6a7c2cc727d
parent28b86b197fffbd068c2f030e987bc145829d9601
Merge branch 'master' into auto-decruft-passive

Conflicts:
dak/generate_filelist.py
dak/dak.py