]> git.ipfire.org Git - thirdparty/sqlalchemy/sqlalchemy.git/commitdiff
Merge branch 'master' into ticket_3100
authorMike Bayer <mike_mp@zzzcomputing.com>
Mon, 15 Sep 2014 20:31:40 +0000 (16:31 -0400)
committerMike Bayer <mike_mp@zzzcomputing.com>
Mon, 15 Sep 2014 20:31:40 +0000 (16:31 -0400)

Trivial merge