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

merge 3.4
---

0d6f9a0465bca2abb799225966271bf6cdf6490f