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

Merge from 3.5
---

bafd4f256069e3ba83fc946bdd7e6698cad32361