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

merge with 3.4
---

9808f7362292cb4cd19e979ace3c18e0fcb14879