From: Antoine Pitrou <solipsis@pitrou.net>
Date: Mon, 13 Apr 2015 17:49:04 +0000 (+0200)
Subject: Merge
X-Git-Tag: v3.5.0a4~88
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0f164c606a2e7d9e9c58f132cc1f69ee89db96fd;p=python

Merge
---

0f164c606a2e7d9e9c58f132cc1f69ee89db96fd