]> git.decadent.org.uk Git - dak.git/commitdiff
Merge branch 'master' into psycopg2
authorMike O'Connor <stew@vireo.org>
Sun, 8 Feb 2009 19:35:20 +0000 (14:35 -0500)
committerMike O'Connor <stew@vireo.org>
Sun, 8 Feb 2009 19:35:20 +0000 (14:35 -0500)

Trivial merge