From: Benjamin Peterson <benjamin@python.org>
Date: Sat, 27 Jun 2015 19:26:29 +0000 (-0500)
Subject: merge 3.5
X-Git-Tag: v3.6.0a1~2038
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5a22ca7fcc8e628f4d1fce252d97aed4d7ed46a3;p=python

merge 3.5
---

5a22ca7fcc8e628f4d1fce252d97aed4d7ed46a3