]> err.no Git - dak/commit
Merge branch 'psycopg2' into content_generation
authorMike O'Connor <stew@vireo.org>
Mon, 9 Feb 2009 07:46:48 +0000 (02:46 -0500)
committerMike O'Connor <stew@vireo.org>
Mon, 9 Feb 2009 07:46:48 +0000 (02:46 -0500)
commitcd5b29ddfd8de263c085f494b9573d683913f6f3
treee9cc841701869bb9e531bb632a07986438c646dd
parentdf1bf169c5b89fa9764a326bbd7a6883a8789f6b
parent574fb13e8dc253e39da7b6259617aafa74c1ec2d
Merge branch 'psycopg2' into content_generation

Conflicts:

daklib/database.py

Signed-off-by: Mike O'Connor <stew@vireo.org>
dak/dak.py
dak/dakdb/update2.py
dak/process_accepted.py
dak/update_db.py
daklib/database.py
daklib/utils.py