From: Ned Deily <nad@acm.org>
Date: Sun, 5 Jul 2015 18:46:12 +0000 (-0700)
Subject: Issue #24540: merger from 3.5
X-Git-Tag: v3.6.0a1~1997
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=14806c4b86196093e2bbe06b61a31a38ecb087a8;p=python

Issue #24540: merger from 3.5
---

14806c4b86196093e2bbe06b61a31a38ecb087a8