[Python-checkins] cpython (merge 3.4 -> 3.4): merge heads

[benjamin.peterson]

https://hg.python.org/cpython/rev/c78137bff841
changeset:   95926:c78137bff841
branch:      3.4
parent:      95925:a04b3de18c4c
parent:      95922:b11073fba1d4
user:        Benjamin Peterson <benjamin at python.org>
date:        Fri May 08 21:32:19 2015 -0400
summary:
  merge heads

files:
  Lib/ensurepip/__init__.py                                   |    2 +-
  Lib/ensurepip/_bundled/setuptools-15.0-py2.py3-none-any.whl |  Bin 
  Lib/ensurepip/_bundled/setuptools-15.2-py2.py3-none-any.whl |  Bin 
  3 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Lib/ensurepip/__init__.py b/Lib/ensurepip/__init__.py
--- a/Lib/ensurepip/__init__.py
+++ b/Lib/ensurepip/__init__.py
@@ -8,7 +8,7 @@
 __all__ = ["version", "bootstrap"]
 
 
-_SETUPTOOLS_VERSION = "15.0"
+_SETUPTOOLS_VERSION = "15.2"
 
 _PIP_VERSION = "6.1.1"
 
diff --git a/Lib/ensurepip/_bundled/setuptools-15.0-py2.py3-none-any.whl b/Lib/ensurepip/_bundled/setuptools-15.0-py2.py3-none-any.whl
deleted file mode 100644
index 578ff3c31c7db40f8777aa1272566362a3793956..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
[stripped]
diff --git a/Lib/ensurepip/_bundled/setuptools-15.2-py2.py3-none-any.whl b/Lib/ensurepip/_bundled/setuptools-15.2-py2.py3-none-any.whl
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..f153ed376684275e08fcfebdb2de8352fb074171
GIT binary patch
[stripped]

-- 
Repository URL: https://hg.python.org/cpython