From: Éric Araujo <merwok@netwok.org>
Date: Sun, 26 Feb 2012 02:48:36 +0000 (+0100)
Subject: Branch merge
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=92904d3a4aafa0437e2d614cef607cbf11860957;p=python

Branch merge
---

92904d3a4aafa0437e2d614cef607cbf11860957