From: Charles-François Natali <cf.natali@gmail.com>
Date: Sun, 25 Aug 2013 16:29:16 +0000 (+0200)
Subject: Merge.
X-Git-Tag: v3.4.0a2~116
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0bb766b95cc672a82d29fbe339e515b921f1bfcc;p=python

Merge.
---

0bb766b95cc672a82d29fbe339e515b921f1bfcc