]> err.no Git - dak/commit
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)
commitd0328e7b4d2dc5baf38f7dd66eb9d6c5bcf5b55e
tree44784bd27b9828db787204f5b38da88f0c79324b
parent5092f26ebf1d8ce76088ed442c2b0a9a1dadf095
parent896f8e3c1ce8896abb4632d8b59db08788012df2
Merge remote-tracking branch 'origin/master' into description-md5

Conflicts:
dak/update_db.py
dak/update_db.py
daklib/filewriter.py