From: Georg Brandl <georg@python.org>
Date: Fri, 31 Oct 2014 06:59:59 +0000 (+0100)
Subject: merge with 3.4
X-Git-Tag: v3.5.0a1~558
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2ae7d689dc112ae659886c9f8209a276d29dab79;p=thirdparty%2FPython%2Fcpython.git

merge with 3.4
---

2ae7d689dc112ae659886c9f8209a276d29dab79