From: Benjamin Peterson <benjamin@python.org>
Date: Wed, 15 Oct 2014 17:40:46 +0000 (-0400)
Subject: merge 3.4
X-Git-Tag: v3.5.0a1~651
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=20521cd039986a172a1618aef6053437d7719953;p=python

merge 3.4
---

20521cd039986a172a1618aef6053437d7719953