Merged 3.4 into default

2015-01-11 15:53:02 -05:00 · 2015-01-11 15:53:02 -05:00 · 2b4ec1ce8a
parent c114e7db60 d9fe22ce9b
commit 2b4ec1ce8a
2 changed files with 1 additions and 1 deletions
--- a/Lib/ensurepip/init.py
+++ b/Lib/ensurepip/init.py
@ -8,7 +8,7 @@ import tempfile
 __all__ = ["version", "bootstrap"]


-_SETUPTOOLS_VERSION = "11.0"
+_SETUPTOOLS_VERSION = "11.3.1"

 _PIP_VERSION = "6.0.6"

--- a/Lib/ensurepip/_bundled/setuptools-11.3.1-py2.py3-none-any.whl
+++ b/Lib/ensurepip/_bundled/setuptools-11.3.1-py2.py3-none-any.whl