]> git.ipfire.org Git - thirdparty/sqlalchemy/sqlalchemy.git/commitdiff
merge default
authorMike Bayer <mike_mp@zzzcomputing.com>
Sat, 12 Jan 2013 22:40:11 +0000 (17:40 -0500)
committerMike Bayer <mike_mp@zzzcomputing.com>
Sat, 12 Jan 2013 22:40:11 +0000 (17:40 -0500)

Trivial merge