From: Charles-François Natali <cf.natali@gmail.com>
Date: Sat, 7 Dec 2013 19:30:41 +0000 (+0100)
Subject: Merge.
X-Git-Tag: v3.4.0b2~307
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=35175a8f07a8d9da20587ab748446d85b615baaa;p=python

Merge.
---

35175a8f07a8d9da20587ab748446d85b615baaa