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

merge with 3.4
---

fe98180bced16be7d62b762cc85d400f929d0885