From: Mike O'Connor <stew@vireo.org>
Date: Mon, 9 Feb 2009 07:46:48 +0000 (-0500)
Subject: Merge branch 'psycopg2' into content_generation
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=cd5b29ddfd8de263c085f494b9573d683913f6f3;hp=cd5b29ddfd8de263c085f494b9573d683913f6f3;p=dak.git

Merge branch 'psycopg2' into content_generation

Conflicts:

	daklib/database.py

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