From: Benjamin Peterson <benjamin@python.org>
Date: Thu, 16 Oct 2014 03:58:32 +0000 (-0400)
Subject: Merge 3.3
X-Git-Tag: v3.5.0a1~647^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fa5021699ab5d906d5fdee004a85f051294126c4;p=python

Merge 3.3
---

fa5021699ab5d906d5fdee004a85f051294126c4