From: Benjamin Peterson <benjamin@python.org>
Date: Fri, 1 Jan 2016 17:12:49 +0000 (-0600)
Subject: merge 3.3
X-Git-Tag: v3.4.5rc1~45
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=86fb46d439bb9f73658ccbd36cbbb20ead795617;p=python

merge 3.3
---

86fb46d439bb9f73658ccbd36cbbb20ead795617