From: Donald Stufft <donald@stufft.io>
Date: Wed, 28 Jan 2015 22:57:05 +0000 (-0500)
Subject: Merge 3.4 into default - Upgrade setuptools to 12.0.5 and pip to 6.0.7
X-Git-Tag: v3.5.0a1~80
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6b9e2009fa257f3b7340b3e84cf0a4ed2e2c2ba9;p=python

Merge 3.4 into default - Upgrade setuptools to 12.0.5 and pip to 6.0.7
---

6b9e2009fa257f3b7340b3e84cf0a4ed2e2c2ba9