From: Benjamin Peterson <benjamin@python.org>
Date: Thu, 5 Mar 2015 03:11:48 +0000 (-0500)
Subject: merge 3.4 (#23476)
X-Git-Tag: v3.5.0a2~28
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b64ae7bf2dcc010e6f0414d365e1ee4caba58ef0;p=python

merge 3.4 (#23476)
---

b64ae7bf2dcc010e6f0414d365e1ee4caba58ef0