From: Charles-François Natali <cf.natali@gmail.com>
Date: Mon, 13 Oct 2014 18:32:38 +0000 (+0100)
Subject: Merge.
X-Git-Tag: v3.5.0a1~670^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4fa7a9fd1ac0fde09becc9916b3b09cd411a56f1;p=python

Merge.
---

4fa7a9fd1ac0fde09becc9916b3b09cd411a56f1