]> git.ipfire.org Git - thirdparty/sqlalchemy/sqlalchemy.git/commitdiff
merge from default
authorMike Bayer <mike_mp@zzzcomputing.com>
Wed, 7 Apr 2010 16:31:15 +0000 (12:31 -0400)
committerMike Bayer <mike_mp@zzzcomputing.com>
Wed, 7 Apr 2010 16:31:15 +0000 (12:31 -0400)
1  2 
lib/sqlalchemy/orm/mapper.py
lib/sqlalchemy/orm/properties.py

Simple merge
Simple merge