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

merge with 3.4
---

b8fa2891526dabbc2f37d0243c093f110c84397a