From: Benjamin Peterson <benjamin@python.org>
Date: Wed, 14 Sep 2016 05:46:50 +0000 (-0700)
Subject: merge 3.5
X-Git-Tag: v3.6.0b2~218
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=54bb13bdfd59d68dcf0bfa2171b903695d9e9f87;p=thirdparty%2FPython%2Fcpython.git

merge 3.5
---

54bb13bdfd59d68dcf0bfa2171b903695d9e9f87