From: Benjamin Peterson <benjamin@python.org>
Date: Mon, 2 Feb 2015 22:47:26 +0000 (-0500)
Subject: merge 3.3
X-Git-Tag: v3.4.3rc1~28
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b0ef78535a94b6b368a8b9935525cb3162c670d4;p=python

merge 3.3
---

b0ef78535a94b6b368a8b9935525cb3162c670d4