[Python-checkins] cpython (merge 3.4 -> default): Merged 3.4 into default

[donald.stufft]

https://hg.python.org/cpython/rev/8b3c609f3f73
changeset:   94118:8b3c609f3f73
parent:      94115:ca5fe2148490
parent:      94117:1b145e8ae4be
user:        Donald Stufft <donald at stufft.io>
date:        Sun Jan 11 15:53:02 2015 -0500
summary:
  Merged 3.4 into default

files:
  Lib/ensurepip/__init__.py                                     |    2 +-
  Lib/ensurepip/_bundled/setuptools-11.0-py2.py3-none-any.whl   |  Bin 
  Lib/ensurepip/_bundled/setuptools-11.3.1-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 = "11.0"
+_SETUPTOOLS_VERSION = "11.3.1"
 
 _PIP_VERSION = "6.0.6"
 
diff --git a/Lib/ensurepip/_bundled/setuptools-11.0-py2.py3-none-any.whl b/Lib/ensurepip/_bundled/setuptools-11.0-py2.py3-none-any.whl
deleted file mode 100644
index ceeaa3cd5c326495156cb90ed3934ee5b712ad2e..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
[stripped]
diff --git 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
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..6892ff89b4f916c40a0044c18d4b41dbf73340e3
GIT binary patch
[stripped]

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