From: Georg Brandl <georg@python.org>
Date: Tue, 28 Oct 2014 21:52:55 +0000 (+0100)
Subject: merge with 3.4
X-Git-Tag: v3.5.0a1~597
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bc40df9bff2d2778322154c61e0fb60a40097a00;p=python

merge with 3.4
---

bc40df9bff2d2778322154c61e0fb60a40097a00