]> git.decadent.org.uk Git - dak.git/commitdiff
Merge branch 'master' into content_generation, make changes based on Joerg's review
authorMike O'Connor <stew@vireo.org>
Sat, 21 Feb 2009 14:29:47 +0000 (09:29 -0500)
committerMike O'Connor <stew@vireo.org>
Sat, 21 Feb 2009 14:29:47 +0000 (09:29 -0500)
Conflicts:

dak/dakdb/update4.py
dak/init_db.py
dak/process_accepted.py
dak/update_db.py
daklib/database.py

Signed-off-by: Mike O'Connor <stew@vireo.org>

No differences found