From: Ned Deily <nad@acm.org>
Date: Sat, 4 Jul 2015 22:06:21 +0000 (-0700)
Subject: Issue #24330: merge from 3.4
X-Git-Tag: v3.5.0b3~2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2e770ce9a09c129fed6646e5b30560e06a3b8183;p=python

Issue #24330: merge from 3.4
---

2e770ce9a09c129fed6646e5b30560e06a3b8183