From: Georg Brandl <georg@python.org>
Date: Wed, 29 Oct 2014 07:52:51 +0000 (+0100)
Subject: merge with 3.4
X-Git-Tag: v3.5.0a1~587
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d64fa1e11ee479fb4651ef6359a1d05bf405149e;p=python

merge with 3.4
---

d64fa1e11ee479fb4651ef6359a1d05bf405149e