From: Benjamin Peterson <benjamin@python.org>
Date: Wed, 15 Oct 2014 15:51:12 +0000 (-0400)
Subject: Merge 3.3
X-Git-Tag: v3.5.0a1~654^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=60d7a731940d978cc152181507522f6b90240f97;p=python

Merge 3.3
---

60d7a731940d978cc152181507522f6b90240f97