From: Charles-François Natali <cf.natali@gmail.com>
Date: Fri, 20 Jun 2014 21:41:46 +0000 (+0100)
Subject: Merge.
X-Git-Tag: v3.5.0a1~1443^2~3
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ccc342d67addf4038cf1babd9b46a6149e45185c;p=thirdparty%2FPython%2Fcpython.git

Merge.
---

ccc342d67addf4038cf1babd9b46a6149e45185c