From: Benjamin Peterson <benjamin@python.org>
Date: Sun, 3 May 2015 15:29:58 +0000 (-0400)
Subject: merge 3.4 (#24096)
X-Git-Tag: v3.5.0b1~251
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=63a6a6fd41da648c9e79a2e347c151e1957d74e9;p=thirdparty%2FPython%2Fcpython.git

merge 3.4 (#24096)
---

63a6a6fd41da648c9e79a2e347c151e1957d74e9