From: Benjamin Peterson <benjamin@python.org>
Date: Fri, 27 Jun 2014 06:29:19 +0000 (-0700)
Subject: merge 3.4
X-Git-Tag: v3.5.0a1~1395
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3cbae68de68ecdc5ab9f11836b50b8307768c11c;p=python

merge 3.4
---

3cbae68de68ecdc5ab9f11836b50b8307768c11c