From: Benjamin Peterson <benjamin@python.org>
Date: Sun, 19 Oct 2014 14:47:58 +0000 (-0400)
Subject: merge 3.3
X-Git-Tag: v3.5.0a1~629^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0fc08fd2c7774a5521ae198b04639ec634fdb5c2;p=python

merge 3.3
---

0fc08fd2c7774a5521ae198b04639ec634fdb5c2