From: Nick Coghlan <ncoghlan@gmail.com>
Date: Sat, 25 Oct 2014 14:02:50 +0000 (+1000)
Subject: Merge issue #22711 from 3.4
X-Git-Tag: v3.5.0a1~612
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b0effcc8ac761110df759c99ab446599cff7746a;p=python

Merge issue #22711 from 3.4
---

b0effcc8ac761110df759c99ab446599cff7746a