From: Benjamin Peterson <benjamin@python.org>
Date: Thu, 30 Apr 2015 21:38:14 +0000 (-0400)
Subject: merge 3.4
X-Git-Tag: v3.5.0b1~272
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2e02875544647cef4f1b137ce6247212985b88a4;p=python

merge 3.4
---

2e02875544647cef4f1b137ce6247212985b88a4