From: Benjamin Peterson <benjamin@python.org>
Date: Sun, 8 Mar 2015 13:42:40 +0000 (-0400)
Subject: merge 3.4 (#23608)
X-Git-Tag: v3.5.0a3~219^2~4
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=af098a221aba15dfd121250e590c8ff72c81665b;p=thirdparty%2FPython%2Fcpython.git

merge 3.4 (#23608)
---

af098a221aba15dfd121250e590c8ff72c81665b