From: Benjamin Peterson <benjamin@python.org>
Date: Wed, 6 Jul 2016 21:04:11 +0000 (-0700)
Subject: merge 3.3
X-Git-Tag: v3.4.6rc1~39
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ede9a0ffa23392a35c5ae5f1688b83c180dbbf08;p=thirdparty%2FPython%2Fcpython.git

merge 3.3
---

ede9a0ffa23392a35c5ae5f1688b83c180dbbf08