From: Benjamin Peterson <benjamin@python.org>
Date: Mon, 6 Apr 2015 17:06:21 +0000 (-0400)
Subject: merge 3.4 (#23875)
X-Git-Tag: v3.5.0a4~157
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7d71c97ec3f4c8f37c81e57a35d53114a6344932;p=thirdparty%2FPython%2Fcpython.git

merge 3.4 (#23875)
---

7d71c97ec3f4c8f37c81e57a35d53114a6344932