From: Nick Coghlan Date: Sun, 12 Oct 2014 00:25:33 +0000 (+1000) Subject: Merge issue #21061 fix from 3.4 X-Git-Tag: v3.5.0a1~692 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=870903e986219eba090e95cab3e86f528be07480;p=python Merge issue #21061 fix from 3.4 --- 870903e986219eba090e95cab3e86f528be07480