]> git.ipfire.org Git - thirdparty/sqlalchemy/sqlalchemy.git/commitdiff
Merge branch 'master' into ticket_3100
authorMike Bayer <mike_mp@zzzcomputing.com>
Tue, 2 Sep 2014 19:05:32 +0000 (15:05 -0400)
committerMike Bayer <mike_mp@zzzcomputing.com>
Tue, 2 Sep 2014 19:05:32 +0000 (15:05 -0400)
1  2 
lib/sqlalchemy/orm/mapper.py
lib/sqlalchemy/orm/persistence.py
lib/sqlalchemy/orm/session.py
test/orm/test_session.py

Simple merge
Simple merge
Simple merge
Simple merge