From: Benjamin Peterson <benjamin@python.org>
Date: Sun, 9 Dec 2012 15:16:46 +0000 (-0500)
Subject: merge 3.2
X-Git-Tag: v3.3.1rc1~549
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4b7743a3ef3ad0220f876ae156f337461c327004;p=python

merge 3.2
---

4b7743a3ef3ad0220f876ae156f337461c327004