From: Benjamin Peterson <benjamin@python.org>
Date: Sun, 29 Sep 2013 14:51:08 +0000 (-0400)
Subject: merge 3.3 (#19118)
X-Git-Tag: v3.4.0a4~311^2~14
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=42686e45c18056f0897c5eb556d0a50e2c1b406b;p=python

merge 3.3 (#19118)
---

42686e45c18056f0897c5eb556d0a50e2c1b406b