]> git.ipfire.org Git - thirdparty/sqlalchemy/sqlalchemy.git/commitdiff
merge tip
authorMike Bayer <mike_mp@zzzcomputing.com>
Sun, 5 Sep 2010 20:07:40 +0000 (16:07 -0400)
committerMike Bayer <mike_mp@zzzcomputing.com>
Sun, 5 Sep 2010 20:07:40 +0000 (16:07 -0400)
1  2 
lib/sqlalchemy/orm/mapper.py

Simple merge