From: Benjamin Peterson <benjamin@python.org>
Date: Tue, 14 Jun 2016 06:43:40 +0000 (-0700)
Subject: merge 3.5
X-Git-Tag: v3.6.0a3~160
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c09087680eb908406d7331323e92a657182c7b89;p=thirdparty%2FPython%2Fcpython.git

merge 3.5
---

c09087680eb908406d7331323e92a657182c7b89