From: Georg Brandl <georg@python.org>
Date: Tue, 28 Oct 2014 20:41:58 +0000 (+0100)
Subject: merge with 3.4
X-Git-Tag: v3.5.0a1~601
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0235709b8c122f7e84ad7e6a80a4c1e74513d8e5;p=thirdparty%2FPython%2Fcpython.git

merge with 3.4
---

0235709b8c122f7e84ad7e6a80a4c1e74513d8e5