]> git.ipfire.org Git - thirdparty/sqlalchemy/sqlalchemy.git/commitdiff
Merge branch 'master' into rel_1_1
authorMike Bayer <mike_mp@zzzcomputing.com>
Mon, 16 Jan 2017 21:28:01 +0000 (16:28 -0500)
committerMike Bayer <mike_mp@zzzcomputing.com>
Mon, 16 Jan 2017 21:28:01 +0000 (16:28 -0500)

Trivial merge