From: Benjamin Peterson <benjamin@python.org>
Date: Tue, 7 Apr 2015 16:00:37 +0000 (-0400)
Subject: merge 3.4 (#23873)
X-Git-Tag: v3.5.0a4~146
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=43a1bed3d21605081581f7f3eb8a731cd71ad51e;p=thirdparty%2FPython%2Fcpython.git

merge 3.4 (#23873)
---

43a1bed3d21605081581f7f3eb8a731cd71ad51e