]> git.ipfire.org Git - thirdparty/sqlalchemy/sqlalchemy.git/commit
Merge remote-tracking branch 'origin/pr/147' into pr147
authorMike Bayer <mike_mp@zzzcomputing.com>
Mon, 9 Feb 2015 00:50:41 +0000 (19:50 -0500)
committerMike Bayer <mike_mp@zzzcomputing.com>
Mon, 9 Feb 2015 00:50:41 +0000 (19:50 -0500)
commita7c8cf0f2f456485a358d6b9ffe69516b8164bcd
tree691938575127faf704c515f88e13658ab6b56ee8
parentab1f7d20589412edc1cf00f8aeab8886ed368a0c
parent02c072edbb1eaa826632e70174eb96915bb725b5
Merge remote-tracking branch 'origin/pr/147' into pr147

Conflicts:
lib/sqlalchemy/orm/query.py
lib/sqlalchemy/orm/query.py