]> git.decadent.org.uk Git - dak.git/commitdiff
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)
Conflicts:

daklib/database.py

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

No differences found