]> git.ipfire.org Git - thirdparty/tornado.git/commit
Merge remote-tracking branch 'screeley/master'
authorBen Darnell <ben@bendarnell.com>
Mon, 7 May 2012 01:30:16 +0000 (18:30 -0700)
committerBen Darnell <ben@bendarnell.com>
Mon, 7 May 2012 01:30:16 +0000 (18:30 -0700)
commit91ea775747f229a3d6981c2628a8a8c4e83a8abb
tree966c58d8e86119402c82c8eb540f43fc18aa71f2
parent6dbce939982cfac185dab8fcd25bde14528660e1
parent12b8c2e5136a04906ea402a435b22948641b4e5c
Merge remote-tracking branch 'screeley/master'

Conflicts:
tornado/simple_httpclient.py
tornado/simple_httpclient.py
tornado/test/simple_httpclient_test.py