]> err.no Git - dak/commitdiff
Merge branch 'master' into pu/backports-merge
authorAnsgar Burchardt <ansgar@debian.org>
Mon, 17 Sep 2012 14:27:33 +0000 (16:27 +0200)
committerAnsgar Burchardt <ansgar@debian.org>
Mon, 17 Sep 2012 14:27:33 +0000 (16:27 +0200)
1  2 
daklib/config.py
daklib/utils.py

Simple merge
diff --cc daklib/utils.py
Simple merge