]> git.ipfire.org Git - thirdparty/sqlalchemy/sqlalchemy.git/commitdiff
merge default
authorMike Bayer <mike_mp@zzzcomputing.com>
Sat, 8 Dec 2012 19:46:01 +0000 (14:46 -0500)
committerMike Bayer <mike_mp@zzzcomputing.com>
Sat, 8 Dec 2012 19:46:01 +0000 (14:46 -0500)

Trivial merge