From: Benjamin Peterson <benjamin@python.org>
Date: Mon, 2 Mar 2015 18:24:21 +0000 (-0500)
Subject: merge heads
X-Git-Tag: v3.5.0a2~43
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=241520ad1038e20554f420e83c65694c5e3fa36a;p=python

merge heads
---

241520ad1038e20554f420e83c65694c5e3fa36a