From: Georg Brandl <georg@python.org>
Date: Tue, 30 Sep 2014 20:56:47 +0000 (+0200)
Subject: merge with 3.4
X-Git-Tag: v3.5.0a1~806
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5eb0645ed5dbab6f1c228a4ecce6d9949c32b119;p=thirdparty%2FPython%2Fcpython.git

merge with 3.4
---

5eb0645ed5dbab6f1c228a4ecce6d9949c32b119