]> git.ipfire.org Git - thirdparty/tornado.git/commitdiff
Merge remote-tracking branch 'codeb2cc/async-request-timeout' into merge
authorBen Darnell <ben@bendarnell.com>
Sun, 3 Nov 2013 20:07:34 +0000 (15:07 -0500)
committerBen Darnell <ben@bendarnell.com>
Sun, 3 Nov 2013 20:07:34 +0000 (15:07 -0500)
1  2 
tornado/simple_httpclient.py
tornado/test/simple_httpclient_test.py

Simple merge