From: Kristján Valur Jónsson <kristjan@ccpgames.com>
Date: Thu, 22 Mar 2012 23:13:48 +0000 (+0000)
Subject: Merge with 3.2 (Issue #14387)
X-Git-Tag: v3.3.0a2~83
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=192195a4fcf3aec27a43169df901667b21ea763a;p=python

Merge with 3.2 (Issue #14387)
---

192195a4fcf3aec27a43169df901667b21ea763a