From: Donald Stufft <donald@stufft.io>
Date: Wed, 1 Jul 2015 15:31:13 +0000 (-0400)
Subject: merge in setuptools/pip update
X-Git-Tag: v3.5.0b3~24
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d6e51560b3475447ab6c8babbf93c486c7b87772;p=python

merge in setuptools/pip update
---

d6e51560b3475447ab6c8babbf93c486c7b87772