]> git.ipfire.org Git - thirdparty/sqlalchemy/sqlalchemy.git/commitdiff
merge dance
authorMike Bayer <mike_mp@zzzcomputing.com>
Fri, 7 Dec 2012 00:15:09 +0000 (19:15 -0500)
committerMike Bayer <mike_mp@zzzcomputing.com>
Fri, 7 Dec 2012 00:15:09 +0000 (19:15 -0500)

Trivial merge