]> git.ipfire.org Git - thirdparty/sqlalchemy/sqlalchemy.git/commitdiff
merge default
authorMike Bayer <mike_mp@zzzcomputing.com>
Mon, 31 Dec 2012 16:49:41 +0000 (11:49 -0500)
committerMike Bayer <mike_mp@zzzcomputing.com>
Mon, 31 Dec 2012 16:49:41 +0000 (11:49 -0500)

Trivial merge