From: Georg Brandl <georg@python.org>
Date: Thu, 30 Oct 2014 21:50:48 +0000 (+0100)
Subject: merge with 3.4
X-Git-Tag: v3.5.0a1~566
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c876cec2168f16c1c370314a9565ca26b2825f7e;p=python

merge with 3.4
---

c876cec2168f16c1c370314a9565ca26b2825f7e