]> git.ipfire.org Git - thirdparty/sqlalchemy/sqlalchemy.git/commitdiff
Merge branch 'master' into ticket_3100
authorMike Bayer <mike_mp@zzzcomputing.com>
Sun, 7 Dec 2014 22:48:32 +0000 (17:48 -0500)
committerMike Bayer <mike_mp@zzzcomputing.com>
Sun, 7 Dec 2014 22:48:32 +0000 (17:48 -0500)
1  2 
doc/build/faq.rst
doc/build/orm/examples.rst
lib/sqlalchemy/orm/mapper.py

Simple merge
Simple merge
Simple merge