]> git.ipfire.org Git - thirdparty/sqlalchemy/sqlalchemy.git/commitdiff
merge from tip
authorMike Bayer <mike_mp@zzzcomputing.com>
Mon, 2 Aug 2010 15:32:04 +0000 (11:32 -0400)
committerMike Bayer <mike_mp@zzzcomputing.com>
Mon, 2 Aug 2010 15:32:04 +0000 (11:32 -0400)
1  2 
lib/sqlalchemy/orm/interfaces.py
lib/sqlalchemy/orm/mapper.py

Simple merge
Simple merge