]> git.ipfire.org Git - thirdparty/sqlalchemy/sqlalchemy.git/commitdiff
Merge branch 'master' into rel_1_0
authorMike Bayer <mike_mp@zzzcomputing.com>
Fri, 30 May 2014 05:38:45 +0000 (01:38 -0400)
committerMike Bayer <mike_mp@zzzcomputing.com>
Fri, 30 May 2014 05:38:45 +0000 (01:38 -0400)

Trivial merge