]> err.no Git - dak/commit
Merge remote branch 'mhy/master' into merge
authorMark Hymers <mhy@debian.org>
Thu, 24 Mar 2011 10:43:02 +0000 (10:43 +0000)
committerMark Hymers <mhy@debian.org>
Thu, 24 Mar 2011 10:43:02 +0000 (10:43 +0000)
commitc6c97ebf8447d3ac7399615b028a2c9d0407c805
treef435d7c4bd2ccb77371d2b1bd43cf55686bfc7b2
parent40970b8f6af57da3b1a65237e7bc6af7ba77ec73
parentb7c831895d5f77fdedd3c8c3d1835154def67824
Merge remote branch 'mhy/master' into merge

Conflicts:
daklib/utils.py

Signed-off-by: Mark Hymers <mhy@debian.org>
daklib/utils.py