From: Benjamin Peterson <benjamin@python.org>
Date: Sun, 2 Dec 2012 16:33:14 +0000 (-0500)
Subject: merge 3.3
X-Git-Tag: v3.4.0a1~1915
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c77dd206989c9f8641f5e128f29599383526e645;p=python

merge 3.3
---

c77dd206989c9f8641f5e128f29599383526e645