From: Benjamin Peterson <benjamin@python.org>
Date: Mon, 11 May 2015 01:19:56 +0000 (-0400)
Subject: merge 3.4
X-Git-Tag: v3.5.0b1~215
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8ec4ae0420f561a997a78d50144ff75ef53424fc;p=python

merge 3.4
---

8ec4ae0420f561a997a78d50144ff75ef53424fc