From: Benjamin Peterson <benjamin@python.org>
Date: Sun, 31 May 2015 05:22:49 +0000 (-0500)
Subject: merge 3.5
X-Git-Tag: v3.6.0a1~2141
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=49fc2c3bbaad9b5ecffe1293428beb4a06867a58;p=python

merge 3.5
---

49fc2c3bbaad9b5ecffe1293428beb4a06867a58