From: Sandro Tosi <sandro.tosi@gmail.com>
Date: Sun, 12 Aug 2012 08:49:40 +0000 (+0200)
Subject: merge with 3.2
X-Git-Tag: v3.3.0rc1~141
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=effb43bc38165f2bd406c67260d9706920bd86be;p=python

merge with 3.2
---

effb43bc38165f2bd406c67260d9706920bd86be