From: Benjamin Peterson <benjamin@python.org>
Date: Sat, 6 Jun 2015 02:03:46 +0000 (-0500)
Subject: merge 3.4
X-Git-Tag: v3.5.0b3~92
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=277b9752609a32d99d968e653d34f92cb03e476c;p=python

merge 3.4
---

277b9752609a32d99d968e653d34f92cb03e476c