From: Benjamin Peterson <benjamin@python.org>
Date: Tue, 30 Sep 2014 02:49:05 +0000 (-0400)
Subject: merge 3.4 (#22517)
X-Git-Tag: v3.5.0a1~821
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=58ee2d31ab2dc039c6929347bf6cfb0cfd827198;p=thirdparty%2FPython%2Fcpython.git

merge 3.4 (#22517)
---

58ee2d31ab2dc039c6929347bf6cfb0cfd827198