From: Benjamin Peterson <benjamin@python.org>
Date: Tue, 26 May 2015 02:24:48 +0000 (-0500)
Subject: merge 3.3
X-Git-Tag: v3.5.0b2~44^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=82d8f06fcd1926906de0ee5ff1154476b7a37ae8;p=python

merge 3.3
---

82d8f06fcd1926906de0ee5ff1154476b7a37ae8