From: Nick Coghlan <ncoghlan@gmail.com>
Date: Sat, 7 Jun 2014 14:00:13 +0000 (+1000)
Subject: Merge issue #21569 from 3.4
X-Git-Tag: v3.5.0a1~1501
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ce6c525762a91d249f9ff877be5697849a47168e;p=python

Merge issue #21569 from 3.4
---

ce6c525762a91d249f9ff877be5697849a47168e