From: Benjamin Peterson <benjamin@python.org>
Date: Wed, 22 Apr 2015 13:16:27 +0000 (-0400)
Subject: merge 3.4 (#22785)
X-Git-Tag: v3.5.0b1~305
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4320f54ea3eb4bc2cb0d371e23276ef510aa25a5;p=thirdparty%2FPython%2Fcpython.git

merge 3.4 (#22785)
---

4320f54ea3eb4bc2cb0d371e23276ef510aa25a5