From: Georg Brandl <georg@python.org>
Date: Thu, 2 Oct 2014 06:35:31 +0000 (+0200)
Subject: merge with 3.4
X-Git-Tag: v3.5.0a1~786
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=54eec2d0af2d020f108214ba221eebe099af5f66;p=python

merge with 3.4
---

54eec2d0af2d020f108214ba221eebe099af5f66