]> git.ipfire.org Git - thirdparty/tornado.git/commitdiff
Merge remote-tracking branch 'tictail/branch3.2'
authorBen Darnell <ben@bendarnell.com>
Wed, 9 Jul 2014 02:27:35 +0000 (22:27 -0400)
committerBen Darnell <ben@bendarnell.com>
Wed, 9 Jul 2014 02:27:35 +0000 (22:27 -0400)
Closes #1097

1  2 
tornado/test/web_test.py
tornado/web.py

Simple merge
diff --cc tornado/web.py
Simple merge