From: Benjamin Peterson <benjamin@python.org>
Date: Thu, 25 Sep 2014 05:07:54 +0000 (-0400)
Subject: merge 3.4
X-Git-Tag: v3.5.0a1~855
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5027a5070dfb939df37f76c998ed907d972e6406;p=python

merge 3.4
---

5027a5070dfb939df37f76c998ed907d972e6406