]> git.ipfire.org Git - thirdparty/sqlalchemy/sqlalchemy.git/commit
Merge branch 'master' into ticket_3100
authorMike Bayer <mike_mp@zzzcomputing.com>
Mon, 18 Aug 2014 21:44:35 +0000 (17:44 -0400)
committerMike Bayer <mike_mp@zzzcomputing.com>
Mon, 18 Aug 2014 21:44:35 +0000 (17:44 -0400)
commitc65ed17bc1f02260f5d13b8a97fb103d682a091b
treec646412a4090e7f1c9033c0daa5c340dfe0d52d4
parent8773307257550e86801217f2b77d47047718807a
parent399c03939768d4c8afb29ca1e091b046ea4fc88f
Merge branch 'master' into ticket_3100

Conflicts:
lib/sqlalchemy/orm/mapper.py
lib/sqlalchemy/orm/persistence.py
lib/sqlalchemy/orm/persistence.py