From: Georg Brandl <georg@python.org>
Date: Sun, 5 Oct 2014 14:38:25 +0000 (+0200)
Subject: merge with 3.4
X-Git-Tag: v3.5.0a1~755
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=31e34fe7a3a4545d3efb4f11ceaf269012585689;p=thirdparty%2FPython%2Fcpython.git

merge with 3.4
---

31e34fe7a3a4545d3efb4f11ceaf269012585689