From: Ned Deily <nad@python.org>
Date: Fri, 23 Dec 2016 09:15:34 +0000 (-0500)
Subject: merge 3.5
X-Git-Tag: v3.6.1rc1~268
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6df6676c28a6c63b71f992ab872b285e2282e4fd;p=thirdparty%2FPython%2Fcpython.git

merge 3.5
---

6df6676c28a6c63b71f992ab872b285e2282e4fd