From: Antoine Pitrou <solipsis@pitrou.net>
Date: Mon, 13 Apr 2015 17:49:35 +0000 (+0200)
Subject: Null merge from 3.4
X-Git-Tag: v3.5.0a4~87
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=682d05528ecd5e4ccdbce5bc90edec1a4fd1d71d;p=python

Null merge from 3.4
---

682d05528ecd5e4ccdbce5bc90edec1a4fd1d71d