From: Benjamin Peterson <benjamin@python.org>
Date: Wed, 27 May 2015 23:32:41 +0000 (-0500)
Subject: merge 3.4
X-Git-Tag: v3.5.0b2~35
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d663cc4848bb42a5ef7d6d887ed3304d789d4141;p=python

merge 3.4
---

d663cc4848bb42a5ef7d6d887ed3304d789d4141