From: Victor Stinner <victor.stinner@gmail.com>
Date: Fri, 13 Jun 2014 12:58:55 +0000 (+0200)
Subject: Merge 3.4 (null merge)
X-Git-Tag: v3.5.0a1~1455
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8a1ba194db2ad6978718e36985e0a7df12cfaffb;p=python

Merge 3.4 (null merge)
---

8a1ba194db2ad6978718e36985e0a7df12cfaffb