From: Antoine Pitrou <solipsis@pitrou.net>
Date: Sun, 2 Nov 2014 17:42:41 +0000 (+0100)
Subject: Merge heads
X-Git-Tag: v3.5.0a1~533
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a14414dfe91d964f75749e30c8c6eeb34696bdc9;p=python

Merge heads
---

a14414dfe91d964f75749e30c8c6eeb34696bdc9