From: Andrew Kuchling <amk@amk.ca>
Date: Wed, 9 Nov 2016 03:14:39 +0000 (-0500)
Subject: Merge from 3.5
X-Git-Tag: v3.6.0b4~117
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9a7aff521e9acfb4cfbccee8c7786d23c21fb269;p=thirdparty%2FPython%2Fcpython.git

Merge from 3.5
---

9a7aff521e9acfb4cfbccee8c7786d23c21fb269