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

Issue #24357: merge from 3.5
---

861d3c99baa5993d97afa206a0e4a29f14d3026c