]> git.ipfire.org Git - thirdparty/sqlalchemy/sqlalchemy.git/commit
Merge branch 'ticket_2587'
authorMike Bayer <mike_mp@zzzcomputing.com>
Wed, 5 Jun 2013 01:38:56 +0000 (21:38 -0400)
committerMike Bayer <mike_mp@zzzcomputing.com>
Wed, 5 Jun 2013 01:38:56 +0000 (21:38 -0400)
commit26ec0507be72d2e1a5abde8b7307012864a88a6b
treeb83e68a0ee000059ff176d29f68706fb0a6da830
parentada19275299f0105f4aaed5bbe0d373ea33feea6
parent69e9574fefd5fbb4673c99ad476a00b03fe22318
Merge branch 'ticket_2587'

Conflicts:
test/profiles.txt
test/sql/test_selectable.py
lib/sqlalchemy/engine/default.py
lib/sqlalchemy/sql/compiler.py
lib/sqlalchemy/sql/expression.py
test/orm/test_eager_relations.py
test/profiles.txt
test/sql/test_selectable.py