From: Charles-François Natali <cf.natali@gmail.com>
Date: Mon, 13 Oct 2014 17:42:49 +0000 (+0100)
Subject: Merge.
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b29ab4a379ccc76e3409ac99c07f31f91b2e15dd;p=python

Merge.
---

b29ab4a379ccc76e3409ac99c07f31f91b2e15dd