From: Benjamin Peterson <benjamin@python.org>
Date: Wed, 25 Feb 2015 15:16:56 +0000 (-0500)
Subject: merge 3.4 (#23515)
X-Git-Tag: v3.5.0a2~90
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c8fd9ce73dd5a02cbd740c2732ac784d18f20656;p=python

merge 3.4 (#23515)
---

c8fd9ce73dd5a02cbd740c2732ac784d18f20656