]> git.ipfire.org Git - thirdparty/sqlalchemy/sqlalchemy.git/commitdiff
Merge branch 'master' into ticket_1068
authorMike Bayer <mike_mp@zzzcomputing.com>
Mon, 3 Jun 2013 19:18:16 +0000 (15:18 -0400)
committerMike Bayer <mike_mp@zzzcomputing.com>
Mon, 3 Jun 2013 19:18:16 +0000 (15:18 -0400)

Trivial merge