From: Éric Araujo <merwok@netwok.org>
Date: Sun, 21 Aug 2011 10:54:06 +0000 (+0200)
Subject: Merge 3.2
X-Git-Tag: v3.3.0a1~1654
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=24d1df79ba58ee6cf1f3800540a8fdf6efe1f3b8;p=python

Merge 3.2
---

24d1df79ba58ee6cf1f3800540a8fdf6efe1f3b8