From: Georg Brandl <georg@python.org>
Date: Thu, 15 Jan 2015 07:16:25 +0000 (+0100)
Subject: merge with 3.4
X-Git-Tag: v3.5.0a1~173
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0443c92ee129535318c5d6b121390e3d8a245eff;p=thirdparty%2FPython%2Fcpython.git

merge with 3.4
---

0443c92ee129535318c5d6b121390e3d8a245eff