From: Benjamin Peterson <benjamin@python.org>
Date: Mon, 3 Nov 2014 20:12:06 +0000 (-0500)
Subject: merge 3.3
X-Git-Tag: v3.5.0a1~529^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8d2d5b9c598d319bc209667f3ae8d2d5186ac82e;p=python

merge 3.3
---

8d2d5b9c598d319bc209667f3ae8d2d5186ac82e