From: Charles-François Natali <cf.natali@gmail.com>
Date: Sun, 15 Dec 2013 18:12:07 +0000 (+0100)
Subject: Merge.
X-Git-Tag: v3.4.0b2~203^2~1^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=325a10277fd32c17788cdf11e3c4db2d648cbc33;p=thirdparty%2FPython%2Fcpython.git

Merge.
---

325a10277fd32c17788cdf11e3c4db2d648cbc33