From: Éric Araujo <merwok@netwok.org>
Date: Fri, 29 Jul 2011 12:24:08 +0000 (+0200)
Subject: Branch merge
X-Git-Tag: v3.2.2rc1~56
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=158d7696f3da163d0d96321120099456b0545716;p=python

Branch merge
---

158d7696f3da163d0d96321120099456b0545716