From: Benjamin Peterson <benjamin@python.org>
Date: Sat, 28 Sep 2013 19:13:10 +0000 (-0400)
Subject: merge 3.3 (#19115)
X-Git-Tag: v3.4.0a3~2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b3b07205979f8cd33707365027d8958c6c525171;p=python

merge 3.3 (#19115)
---

b3b07205979f8cd33707365027d8958c6c525171