]> git.ipfire.org Git - thirdparty/sqlalchemy/sqlalchemy.git/commit
merged -r6055:6064 of trunk
authorMike Bayer <mike_mp@zzzcomputing.com>
Tue, 16 Jun 2009 19:26:37 +0000 (19:26 +0000)
committerMike Bayer <mike_mp@zzzcomputing.com>
Tue, 16 Jun 2009 19:26:37 +0000 (19:26 +0000)
commit9d51bf134b5c1b531dcd7e6120ecd2a57b341964
treeadb07423916cfc3b16899fe99fc0306822ac2e01
parent6a2eb48c614138dcafa8bfc892832147bd9692e3
merged -r6055:6064 of trunk
CHANGES
CHANGES_PRE_05 [new file with mode: 0644]
doc/build/reference/ext/associationproxy.rst
lib/sqlalchemy/orm/state.py
test/orm/test_merge.py
test/orm/test_query.py