From: Benjamin Peterson <benjamin@python.org>
Date: Wed, 15 Oct 2014 17:40:53 +0000 (-0400)
Subject: Merge heads
X-Git-Tag: v3.5.0a1~650
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ea1f665197bb5bd8e169106d78801b9ad0f923d2;p=python

Merge heads
---

ea1f665197bb5bd8e169106d78801b9ad0f923d2