From: Victor Stinner <victor.stinner@gmail.com>
Date: Fri, 12 Jun 2015 20:02:08 +0000 (+0200)
Subject: Null merge 3.5 (change already applied to default)
X-Git-Tag: v3.6.0a1~2076
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=809fb3b97e0c3d85a49609edbc60f4b18ce3ddb4;p=python

Null merge 3.5 (change already applied to default)
---

809fb3b97e0c3d85a49609edbc60f4b18ce3ddb4