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

merge with 3.4
---

96d836833e4a5dc02d304d1e05df4741bdf38037