merge 3.3 (#20695)
authorBenjamin Peterson <benjamin@python.org>
Thu, 20 Feb 2014 04:06:41 +0000 (23:06 -0500)
committerBenjamin Peterson <benjamin@python.org>
Thu, 20 Feb 2014 04:06:41 +0000 (23:06 -0500)
1  2 
Lib/test/test_urllibnet.py

Simple merge