]> git.ipfire.org Git - thirdparty/tornado.git/commitdiff
Merge remote-tracking branch 'jparise/append-handlers' into merge
authorBen Darnell <ben@bendarnell.com>
Fri, 21 Dec 2012 04:42:38 +0000 (23:42 -0500)
committerBen Darnell <ben@bendarnell.com>
Fri, 21 Dec 2012 04:42:38 +0000 (23:42 -0500)
1  2 
tornado/test/web_test.py
tornado/web.py

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