]> git.ipfire.org Git - thirdparty/sqlalchemy/sqlalchemy.git/commitdiff
merge default
authorMike Bayer <mike_mp@zzzcomputing.com>
Fri, 14 Dec 2012 20:57:05 +0000 (15:57 -0500)
committerMike Bayer <mike_mp@zzzcomputing.com>
Fri, 14 Dec 2012 20:57:05 +0000 (15:57 -0500)

Trivial merge