From: Benjamin Peterson <benjamin@python.org>
Date: Sun, 27 Sep 2015 09:07:50 +0000 (-0700)
Subject: merge 3.5
X-Git-Tag: v3.6.0a1~1424
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bb6c1c5a7e21d6f10ba065c319c352be2852a5b8;p=thirdparty%2FPython%2Fcpython.git

merge 3.5
---

bb6c1c5a7e21d6f10ba065c319c352be2852a5b8