From: Georg Brandl <georg@python.org>
Date: Wed, 29 Oct 2014 07:11:55 +0000 (+0100)
Subject: merge with 3.4
X-Git-Tag: v3.5.0a1~590
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=76c49a2fb9e48439dc5094be06462bea74ead538;p=thirdparty%2FPython%2Fcpython.git

merge with 3.4
---

76c49a2fb9e48439dc5094be06462bea74ead538