From: Benjamin Peterson <benjamin@python.org>
Date: Sun, 31 Aug 2014 21:22:27 +0000 (-0400)
Subject: merge 3.4
X-Git-Tag: v3.5.0a1~987
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c49a6aa1f004ec8399dfc2a326ccc39b658ec5b4;p=python

merge 3.4
---

c49a6aa1f004ec8399dfc2a326ccc39b658ec5b4