]> err.no Git - dak/commitdiff
Merge remote-tracking branch 'origin/master' into description-md5
authorAnsgar Burchardt <ansgar@debian.org>
Sun, 4 Sep 2011 12:53:45 +0000 (14:53 +0200)
committerAnsgar Burchardt <ansgar@debian.org>
Sun, 4 Sep 2011 12:53:45 +0000 (14:53 +0200)
Conflicts:
dak/update_db.py

1  2 
dak/update_db.py
daklib/filewriter.py

Simple merge
Simple merge