From: Ned Deily <nad@acm.org>
Date: Tue, 2 Jun 2015 01:55:45 +0000 (-0700)
Subject: Issue #24357: merge from 3.4
X-Git-Tag: v3.5.0b3~117
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3e4f976965b24ad1e84d1e1c6b5224d081f65165;p=python

Issue #24357: merge from 3.4
---

3e4f976965b24ad1e84d1e1c6b5224d081f65165