From: Victor Stinner <victor.stinner@gmail.com>
Date: Sat, 25 Jul 2015 00:43:31 +0000 (+0200)
Subject: Merge 3.4
X-Git-Tag: v3.5.0b4~7
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=389e3d768d8f5bd312476db795f6432651bc656b;p=python

Merge 3.4
---

389e3d768d8f5bd312476db795f6432651bc656b