From: Benjamin Peterson <benjamin@python.org>
Date: Sat, 5 Dec 2015 08:27:23 +0000 (-0800)
Subject: merge 3.3
X-Git-Tag: v3.4.4rc1~4
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e2825e9522e2beb3ced43b20cc7eb2e51236bedf;p=python

merge 3.3
---

e2825e9522e2beb3ced43b20cc7eb2e51236bedf