SIGN IN SIGN UP

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

D
Donald Stufft committed
6b9e2009fa257f3b7340b3e84cf0a4ed2e2c2ba9