Merge pull request #700 from icaromedeiros/master

author bdarnell <ben@bendarnell.com>

Sat, 13 Apr 2013 23:21:03 +0000 (16:21 -0700)

committer bdarnell <ben@bendarnell.com>

Sat, 13 Apr 2013 23:21:03 +0000 (16:21 -0700)
author bdarnell <ben@bendarnell.com>
Sat, 13 Apr 2013 23:21:03 +0000 (16:21 -0700)
committer bdarnell <ben@bendarnell.com>
Sat, 13 Apr 2013 23:21:03 +0000 (16:21 -0700)
diff --cc tornado/curl_httpclient.py
Simple merge
diff --cc tornado/httpclient.py
Simple merge
author	bdarnell <ben@bendarnell.com>
	Sat, 13 Apr 2013 23:21:03 +0000 (16:21 -0700)
committer	bdarnell <ben@bendarnell.com>
	Sat, 13 Apr 2013 23:21:03 +0000 (16:21 -0700)
		1	2
tornado/curl_httpclient.py	patch \|	diff1 \|	diff2 \|	blob \| history
tornado/httpclient.py	patch \|	diff1 \|	diff2 \|	blob \| history