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

merge with 3.4
---

347c3f6e346bf861b881d96f35feb5434ab8de92