From: Benjamin Peterson <benjamin@python.org>
Date: Sun, 18 May 2014 03:02:28 +0000 (-0700)
Subject: (null merge 3.4)
X-Git-Tag: v3.5.0a1~1633
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4c5a187c0aa431b28d8e03d46f7583fddb6b365b;p=python

(null merge 3.4)
---

4c5a187c0aa431b28d8e03d46f7583fddb6b365b