From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Wed, 6 Mar 2013 00:59:25 +0000 (+0200)
Subject: #17363: merge with 3.3.
X-Git-Tag: v3.4.0a1~1269
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=648b5900d5ac25561ecb4c5fa9148134f6268cea;p=python

#17363: merge with 3.3.
---

648b5900d5ac25561ecb4c5fa9148134f6268cea