From: Éric Araujo <aeric@mtlpy.org>
Date: Sun, 9 Dec 2012 03:47:03 +0000 (-0500)
Subject: Branch merge
X-Git-Tag: v3.3.1rc1~552^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=24457c9ad375239aca9bd176284d1e4f181e02f4;p=python

Branch merge
---

24457c9ad375239aca9bd176284d1e4f181e02f4