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

merge 3.2 (#23130)
---

9582b33933692a432d9285a7b89091356e78aad6