From: Georg Brandl <georg@python.org>
Date: Sun, 12 Oct 2014 14:13:38 +0000 (+0200)
Subject: merge with 3.4
X-Git-Tag: v3.5.0a1~682
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7728fe8e87f11354de72df34d294106894e87de1;p=python

merge with 3.4
---

7728fe8e87f11354de72df34d294106894e87de1