From: Georg Brandl <georg@python.org>
Date: Wed, 29 Oct 2014 09:57:42 +0000 (+0100)
Subject: merge with 3.4
X-Git-Tag: v3.5.0a1~583
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bad8d4bb53577fbea939d3490713dc9d941eb27f;p=thirdparty%2FPython%2Fcpython.git

merge with 3.4
---

bad8d4bb53577fbea939d3490713dc9d941eb27f