]> git.ipfire.org Git - thirdparty/sqlalchemy/sqlalchemy.git/commitdiff
Merge branch 'master' into rel_1_0
authorMike Bayer <mike_mp@zzzcomputing.com>
Thu, 29 May 2014 23:55:11 +0000 (19:55 -0400)
committerMike Bayer <mike_mp@zzzcomputing.com>
Thu, 29 May 2014 23:55:11 +0000 (19:55 -0400)

Trivial merge