]> git.ipfire.org Git - thirdparty/sqlalchemy/sqlalchemy.git/commitdiff
Merge remote-tracking branch 'origin/pr/231' into pr231
authorMike Bayer <mike_mp@zzzcomputing.com>
Wed, 30 Mar 2016 21:05:30 +0000 (17:05 -0400)
committerMike Bayer <mike_mp@zzzcomputing.com>
Wed, 30 Mar 2016 21:05:30 +0000 (17:05 -0400)
1  2 
lib/sqlalchemy/cextension/resultproxy.c
lib/sqlalchemy/engine/result.py

Simple merge