]> err.no Git - dak/commit
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)
commitfdf3c42445b4f11f4cd71634dd2b57cb7d7a4f36
tree5dac720312b022b5ee6329461c8616fa883ca025
parentd878ff767ef1d4579cdb5e0b9bc3890e27fffc18
parentb34e1454c174ccc89f552a0871fbf18e19a01264
Merge branch 'master' into content_generation, make changes based on Joerg's review

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>
config/debian/dak.conf
dak/contents.py
dak/dak.py
dak/dakdb/update4.py
dak/init_db.py
dak/process_accepted.py
dak/process_unchecked.py
dak/rm.py
daklib/database.py
daklib/utils.py
templates/missing-contents