From: Benjamin Peterson <benjamin@python.org>
Date: Thu, 29 Nov 2012 15:57:11 +0000 (-0500)
Subject: merge 3.2
X-Git-Tag: v3.3.1rc1~579
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=daf28293e1a422efa222a493b378b4614e7c5512;p=python

merge 3.2
---

daf28293e1a422efa222a493b378b4614e7c5512