Merge 3.4

6bde454f · Donald Stufft · 621333d2 · 16d7d594 · 6bde454f · 6bde454f
Kaydet (Commit) 6bde454f authored Eyl 09, 2016 tarafından Donald Stufft
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

__init__.py Lib/ensurepip/__init__.py +1 -1

setuptools-27.1.2-py2.py3-none-any.whl ...ensurepip/_bundled/setuptools-27.1.2-py2.py3-none-any.whl +0 -0

No files found.
--- 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.1-py2.py3-none-any.whl
+++ b/Lib/ensurepip/_bundled/setuptools-27.1.1-py2.py3-none-any.whl