From: Éric Araujo <merwok@netwok.org>
Date: Wed, 19 Oct 2011 19:32:39 +0000 (+0200)
Subject: Branch merge
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3bb8be6d78130dfcf49c4860f0009300508ff92b;p=python

Branch merge
---

3bb8be6d78130dfcf49c4860f0009300508ff92b