From: Benjamin Peterson <benjamin@python.org>
Date: Wed, 15 Oct 2014 17:40:01 +0000 (-0400)
Subject: merge 3.3 (#22643)
X-Git-Tag: v3.5.0a1~652^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3f9f612b7ded1da1e91b5cddc198e6e281c215c0;p=python

merge 3.3 (#22643)
---

3f9f612b7ded1da1e91b5cddc198e6e281c215c0