Merge 3.4

2016-09-09 12:14:43 -04:00 · 2016-09-09 12:14:43 -04:00 · 6bde454f9e
parent 621333d227 16d7d5941d
commit 6bde454f9e
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 = "27.1.1"
+_SETUPTOOLS_VERSION = "27.1.2"

 _PIP_VERSION = "8.1.2"

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