merge heads

This commit is contained in:
Benjamin Peterson 2015-05-08 21:32:19 -04:00
commit 07abcf58d9
2 changed files with 1 additions and 1 deletions

View file

@ -8,7 +8,7 @@ import tempfile
__all__ = ["version", "bootstrap"]
_SETUPTOOLS_VERSION = "15.0"
_SETUPTOOLS_VERSION = "15.2"
_PIP_VERSION = "6.1.1"