From: Benjamin Peterson <benjamin@python.org>
Date: Sun, 5 Jul 2015 00:59:50 +0000 (-0500)
Subject: merge 3.5 (#24407)
X-Git-Tag: v3.6.0a1~2005
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d34c246baf7bdfb2d5dacf04b7d5fae76a20ed2c;p=thirdparty%2FPython%2Fcpython.git

merge 3.5 (#24407)
---

d34c246baf7bdfb2d5dacf04b7d5fae76a20ed2c