From: Benjamin Peterson <benjamin@python.org>
Date: Thu, 2 Jul 2015 21:58:38 +0000 (-0500)
Subject: merge 3.5
X-Git-Tag: v3.6.0a1~2013
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ac2ed9d8951eaeb9febc76650fa2ff1442d68317;p=python

merge 3.5
---

ac2ed9d8951eaeb9febc76650fa2ff1442d68317