From: Terry Jan Reedy Date: Fri, 5 Dec 2014 04:29:07 +0000 (-0500) Subject: Merge from 3.4 after patch separately committed as 697adefaba6b. X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5843a4b23d44e923a8cc291fed63030f9941e462;p=python Merge from 3.4 after patch separately committed as 697adefaba6b. --- 5843a4b23d44e923a8cc291fed63030f9941e462