From: Georg Brandl <georg@python.org>
Date: Wed, 29 Oct 2014 07:04:31 +0000 (+0100)
Subject: merge with 3.4
X-Git-Tag: v3.5.0a1~592
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fa7a2953cc2260b6f2ffe94955fcddfd83d3595d;p=python

merge with 3.4
---

fa7a2953cc2260b6f2ffe94955fcddfd83d3595d