From: Benjamin Peterson <benjamin@python.org>
Date: Mon, 20 Apr 2015 22:22:21 +0000 (-0400)
Subject: merge 3.4 (#23989)
X-Git-Tag: v3.5.0b1~316
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d19458ac51633cac979b7c7b9439ea89f179c8c8;p=thirdparty%2FPython%2Fcpython.git

merge 3.4 (#23989)
---

d19458ac51633cac979b7c7b9439ea89f179c8c8