From: Sandro Tosi <sandro.tosi@gmail.com>
Date: Sat, 4 Aug 2012 17:42:46 +0000 (+0200)
Subject: merge with 3.2
X-Git-Tag: v3.3.0b2~48
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ba5010a64963e93e8b4dccb076e998a1e42bd71d;p=python

merge with 3.2
---

ba5010a64963e93e8b4dccb076e998a1e42bd71d