From: Victor Stinner <victor.stinner@gmail.com>
Date: Mon, 20 Jul 2015 15:13:16 +0000 (+0200)
Subject: Merge 3.4
X-Git-Tag: v3.5.0b4~35
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3d0b8422bcbed2c06394ac7dfc9e7cbfe910b220;p=python

Merge 3.4
---

3d0b8422bcbed2c06394ac7dfc9e7cbfe910b220