From: Benjamin Peterson <benjamin@python.org>
Date: Wed, 5 Nov 2014 16:29:39 +0000 (-0500)
Subject: merge 3.2
X-Git-Tag: v3.4.3rc1~358^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e71abcc7bb0ab2d11af25d6a65db73701b58a91c;p=thirdparty%2FPython%2Fcpython.git

merge 3.2
---

e71abcc7bb0ab2d11af25d6a65db73701b58a91c
diff --cc Lib/test/test_urllib2net.py
index f50a2bb2205f,f2d20c0bf8b4..f618ecfdad6c
mode 100644,100755..100644
--- a/Lib/test/test_urllib2net.py
+++ b/Lib/test/test_urllib2net.py