From: Charles-François Natali <cf.natali@gmail.com>
Date: Fri, 20 Jun 2014 21:41:46 +0000 (+0100)
Subject: Merge.
X-Git-Tag: v3.5.0a1~1443^2~3
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ccc342d67addf4038cf1babd9b46a6149e45185c;p=python

Merge.
---

ccc342d67addf4038cf1babd9b46a6149e45185c