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

Trivial merge