From: Éric Araujo <merwok@netwok.org>
Date: Wed, 25 May 2011 16:13:49 +0000 (+0200)
Subject: Merge 3.1
X-Git-Tag: v3.2.1rc2~118^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=51b7aedaddb357340fa219d89f263269562d1f62;p=python

Merge 3.1
---

51b7aedaddb357340fa219d89f263269562d1f62