From: Benjamin Peterson <benjamin@python.org>
Date: Fri, 24 Apr 2015 16:02:53 +0000 (-0400)
Subject: merge 3.4 (#24049)
X-Git-Tag: v3.5.0b1~295
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=51f58059f6d5eb958201d1d90286e5917b77ed59;p=thirdparty%2FPython%2Fcpython.git

merge 3.4 (#24049)
---

51f58059f6d5eb958201d1d90286e5917b77ed59