From: Victor Stinner <victor.stinner@gmail.com>
Date: Thu, 9 Oct 2014 20:16:15 +0000 (+0200)
Subject: Merge 3.4
X-Git-Tag: v3.5.0a1~726
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=aad627f2f94c426fab6d8341ffd60ca36cc005b7;p=python

Merge 3.4
---

aad627f2f94c426fab6d8341ffd60ca36cc005b7