From: Georg Brandl <georg@python.org>
Date: Sun, 19 Oct 2014 09:55:15 +0000 (+0200)
Subject: merge with 3.4
X-Git-Tag: v3.5.0a1~630
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6e868b7bef5a984f1be472186948ce772ab2edfa;p=python

merge with 3.4
---

6e868b7bef5a984f1be472186948ce772ab2edfa