From: Benjamin Peterson <benjamin@python.org>
Date: Tue, 30 Sep 2014 20:02:26 +0000 (-0400)
Subject: merge 3.4 (#22528)
X-Git-Tag: v3.5.0a1~810
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8de5b40fc2c0cbe8aae82ea3ea9e020fb0f675a4;p=python

merge 3.4 (#22528)
---

8de5b40fc2c0cbe8aae82ea3ea9e020fb0f675a4