From: Joerg Jaspert Date: Fri, 13 Mar 2009 16:20:53 +0000 (+0100) Subject: Merge commit 'stew/content_generation' into merge X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=8ee81b67fbd35c771d8a3c18e53eb9f6e919ac47;hp=630184061d9e7e677c422548ed03187cb21f5870;p=dak.git Merge commit 'stew/content_generation' into merge * commit 'stew/content_generation': add import dbconn to database.py Signed-off-by: Joerg Jaspert ---