From: Benjamin Peterson <benjamin@python.org>
Date: Mon, 2 Mar 2015 18:23:41 +0000 (-0500)
Subject: merge 3.3 (#23362)
X-Git-Tag: v3.5.0a2~44^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=92ce1b4392a533a14bbebb8e60bf79bf4bf4c6c7;p=python

merge 3.3 (#23362)
---

92ce1b4392a533a14bbebb8e60bf79bf4bf4c6c7