From: Benjamin Peterson <benjamin@python.org>
Date: Tue, 30 Dec 2014 16:09:17 +0000 (-0600)
Subject: merge 3.3 (#23130)
X-Git-Tag: v3.4.3rc1~187
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3cd1af51f67d56874529a4581e9cdbd3c7277cee;p=python

merge 3.3 (#23130)
---

3cd1af51f67d56874529a4581e9cdbd3c7277cee