]> git.ipfire.org Git - thirdparty/sqlalchemy/sqlalchemy.git/commitdiff
merge tip
authorMike Bayer <mike_mp@zzzcomputing.com>
Thu, 18 Nov 2010 23:53:46 +0000 (18:53 -0500)
committerMike Bayer <mike_mp@zzzcomputing.com>
Thu, 18 Nov 2010 23:53:46 +0000 (18:53 -0500)
1  2 
lib/sqlalchemy/orm/mapper.py

Simple merge