From: Georg Brandl <georg@python.org>
Date: Mon, 6 Oct 2014 11:54:43 +0000 (+0200)
Subject: merge with 3.4
X-Git-Tag: v3.5.0a1~745
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c53bc48068cef0ef5a05488c4164ed65b669fcf6;p=python

merge with 3.4
---

c53bc48068cef0ef5a05488c4164ed65b669fcf6