From: Ned Deily <nad@acm.org>
Date: Tue, 2 Jun 2015 02:21:03 +0000 (-0700)
Subject: Issue #24357: merge from 3.5
X-Git-Tag: v3.6.0a1~2126
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a62ad755ebc144c8c456bfb2cdf31d60883e6786;p=thirdparty%2FPython%2Fcpython.git

Issue #24357: merge from 3.5
---

a62ad755ebc144c8c456bfb2cdf31d60883e6786