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

Merge.
---

120bb115b65a587be5e43446d606d8f6c1625df7