From: Benjamin Peterson <benjamin@python.org>
Date: Sun, 26 Apr 2015 19:56:23 +0000 (-0400)
Subject: merge 3.4 (#24058)
X-Git-Tag: v3.5.0b1~281
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fc9d6f600e7b46acf6a36c54c558af7d0bf3dfb7;p=thirdparty%2FPython%2Fcpython.git

merge 3.4 (#24058)
---

fc9d6f600e7b46acf6a36c54c558af7d0bf3dfb7