From: Benjamin Peterson <benjamin@python.org>
Date: Thu, 19 Feb 2015 22:58:19 +0000 (-0500)
Subject: merge 3.4 (#23481)
X-Git-Tag: v3.5.0a2~119
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=869311dd97bff0b22689fcfe1b348bad6b1ab4e6;p=thirdparty%2FPython%2Fcpython.git

merge 3.4 (#23481)
---

869311dd97bff0b22689fcfe1b348bad6b1ab4e6