From: Benjamin Peterson <benjamin@python.org>
Date: Sat, 30 May 2015 05:02:25 +0000 (-0500)
Subject: Merge 3.5
X-Git-Tag: v3.5.0b2~13^2~5
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e16f427243680fba9fa606b0d3df9ec6b5a28168;p=python

Merge 3.5
---

e16f427243680fba9fa606b0d3df9ec6b5a28168