From: Benjamin Peterson <benjamin@python.org>
Date: Thu, 7 May 2015 01:31:07 +0000 (-0400)
Subject: merge 3.4
X-Git-Tag: v3.5.0b1~231
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ec9b7728fe2f9314b2795573c1ffc12fe616900e;p=python

merge 3.4
---

ec9b7728fe2f9314b2795573c1ffc12fe616900e