]> git.ipfire.org Git - thirdparty/sqlalchemy/sqlalchemy.git/commitdiff
Merge remote-tracking branch 'origin/pr/210'
authorMike Bayer <mike_mp@zzzcomputing.com>
Mon, 30 Nov 2015 16:40:44 +0000 (11:40 -0500)
committerMike Bayer <mike_mp@zzzcomputing.com>
Mon, 30 Nov 2015 16:40:44 +0000 (11:40 -0500)
1  2 
lib/sqlalchemy/orm/events.py
lib/sqlalchemy/util/langhelpers.py

Simple merge
Simple merge