]> git.ipfire.org Git - thirdparty/sqlalchemy/sqlalchemy.git/commitdiff
merge
authorMike Bayer <mike_mp@zzzcomputing.com>
Tue, 7 Jun 2011 02:24:50 +0000 (22:24 -0400)
committerMike Bayer <mike_mp@zzzcomputing.com>
Tue, 7 Jun 2011 02:24:50 +0000 (22:24 -0400)

Trivial merge