From: Ned Deily <nad@acm.org>
Date: Fri, 9 Jan 2015 21:33:28 +0000 (-0800)
Subject: Issue #23212: merge from 3.4
X-Git-Tag: v3.5.0a1~202
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0e98b83f00ace1afcc2a70dd1ee90a08ad3eb846;p=python

Issue #23212: merge from 3.4
---

0e98b83f00ace1afcc2a70dd1ee90a08ad3eb846