From: Nick Coghlan <ncoghlan@gmail.com>
Date: Tue, 26 May 2015 11:57:16 +0000 (+1000)
Subject: Merge fix for issue #24285 from 3.5
X-Git-Tag: v3.5.0b2~13^2~37
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=06f155f4884dff99bfd72a38d8930449a24cbf28;p=python

Merge fix for issue #24285 from 3.5
---

06f155f4884dff99bfd72a38d8930449a24cbf28