]> git.donarmstrong.com Git - dak.git/commitdiff
Merge branch 'master' into debian-r
authorDon Armstrong <don@donarmstrong.com>
Tue, 11 Nov 2014 23:34:34 +0000 (15:34 -0800)
committerDon Armstrong <don@donarmstrong.com>
Tue, 11 Nov 2014 23:34:34 +0000 (15:34 -0800)
Conflicts:
dak/generate_packages_sources2.py
dak/generate_releases.py
docs/README.first

1  2 
dak/generate_packages_sources2.py
dak/init_dirs.py

Simple merge
Simple merge