From: Éric Araujo <merwok@netwok.org>
Date: Sat, 25 Feb 2012 15:32:18 +0000 (+0100)
Subject: Merge 3.2
X-Git-Tag: v3.3.0a1~65
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c071a613df254f6c38427ca8ed47553f7a458a59;p=python

Merge 3.2
---

c071a613df254f6c38427ca8ed47553f7a458a59