From: Benjamin Peterson <benjamin@python.org>
Date: Tue, 14 Apr 2015 00:25:11 +0000 (-0400)
Subject: merge 3.4 (#23929)
X-Git-Tag: v3.5.0a4~66
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cd1aa9158ec89d541ed6309f1766e188778a1499;p=thirdparty%2FPython%2Fcpython.git

merge 3.4 (#23929)
---

cd1aa9158ec89d541ed6309f1766e188778a1499