From: Benjamin Peterson <benjamin@python.org>
Date: Mon, 13 Oct 2014 15:55:11 +0000 (-0400)
Subject: merge 3.4
X-Git-Tag: v3.5.0a1~671
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e6798bb55127ef6af93e442027cdf485ea62fd5f;p=python

merge 3.4
---

e6798bb55127ef6af93e442027cdf485ea62fd5f