From: Benjamin Peterson <benjamin@python.org>
Date: Wed, 3 Jun 2015 05:04:52 +0000 (-0500)
Subject: merge 3.5
X-Git-Tag: v3.6.0a1~2113
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=459a398c5510ff835b8f85e0bc29b74b1ead979c;p=python

merge 3.5
---

459a398c5510ff835b8f85e0bc29b74b1ead979c