]> git.ipfire.org Git - thirdparty/tornado.git/commitdiff
Merge remote-tracking branch 'evanj/master' into merge
authorBen Darnell <ben@bendarnell.com>
Mon, 20 Aug 2012 02:20:58 +0000 (19:20 -0700)
committerBen Darnell <ben@bendarnell.com>
Mon, 20 Aug 2012 02:20:58 +0000 (19:20 -0700)
1  2 
tornado/simple_httpclient.py
tornado/test/simple_httpclient_test.py

Simple merge