Merge 3.4 (httplib)

author Victor Stinner <victor.stinner@gmail.com>

Fri, 27 Feb 2015 16:47:40 +0000 (17:47 +0100)

committer Victor Stinner <victor.stinner@gmail.com>

Fri, 27 Feb 2015 16:47:40 +0000 (17:47 +0100)
author Victor Stinner <victor.stinner@gmail.com>
Fri, 27 Feb 2015 16:47:40 +0000 (17:47 +0100)
committer Victor Stinner <victor.stinner@gmail.com>
Fri, 27 Feb 2015 16:47:40 +0000 (17:47 +0100)
diff --cc Lib/test/test_httplib.py
Simple merge
diff --cc Misc/ACKS
Simple merge
author	Victor Stinner <victor.stinner@gmail.com>
	Fri, 27 Feb 2015 16:47:40 +0000 (17:47 +0100)
committer	Victor Stinner <victor.stinner@gmail.com>
	Fri, 27 Feb 2015 16:47:40 +0000 (17:47 +0100)
		1	2
Lib/test/test_httplib.py	patch \|	diff1 \|	diff2 \|	blob \| history
Misc/ACKS	patch \|	diff1 \|	diff2 \|	blob \| history