Merge 3.4 into default, upgrading pip to 7.0.1
diff --git a/Lib/ensurepip/__init__.py b/Lib/ensurepip/__init__.py
index 16e0eee..592ffde 100644
--- a/Lib/ensurepip/__init__.py
+++ b/Lib/ensurepip/__init__.py
@@ -10,7 +10,7 @@
_SETUPTOOLS_VERSION = "16.0"
-_PIP_VERSION = "7.0.0"
+_PIP_VERSION = "7.0.1"
# pip currently requires ssl support, so we try to provide a nicer
# error message when that is missing (http://bugs.python.org/issue19744)
diff --git a/Lib/ensurepip/_bundled/pip-7.0.0-py2.py3-none-any.whl b/Lib/ensurepip/_bundled/pip-7.0.1-py2.py3-none-any.whl
similarity index 93%
rename from Lib/ensurepip/_bundled/pip-7.0.0-py2.py3-none-any.whl
rename to Lib/ensurepip/_bundled/pip-7.0.1-py2.py3-none-any.whl
index 926d2a7..30a61f0 100644
--- a/Lib/ensurepip/_bundled/pip-7.0.0-py2.py3-none-any.whl
+++ b/Lib/ensurepip/_bundled/pip-7.0.1-py2.py3-none-any.whl
Binary files differ