From: Victor Stinner <victor.stinner@gmail.com>
Date: Thu, 22 Jan 2015 08:09:24 +0000 (+0100)
Subject: Merge 3.4
X-Git-Tag: v3.5.0a1~135
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f07717c10540e5596dd3beb37b429ca98066ff08;p=python

Merge 3.4
---

f07717c10540e5596dd3beb37b429ca98066ff08