]> git.ipfire.org Git - thirdparty/tornado.git/commit
Merge remote-tracking branch 'amorton/master'
authorBen Darnell <ben@bendarnell.com>
Wed, 18 Jan 2012 09:11:21 +0000 (01:11 -0800)
committerBen Darnell <ben@bendarnell.com>
Wed, 18 Jan 2012 09:11:21 +0000 (01:11 -0800)
commit24d96f0286f44c6b4cd9020618835e0cd8cd7d9f
tree2273a03883c890409419a23ead0a971516c4be9f
parent97b4b15cdab3b4c2385470ca613e21390eac7691
parent45752bfdf96724e88d616f626132461e08e02a33
Merge remote-tracking branch 'amorton/master'

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