From: Steve Dower <steve.dower@microsoft.com>
Date: Thu, 1 Oct 2015 22:20:11 +0000 (-0700)
Subject: Merge from 3.5
X-Git-Tag: v3.6.0a1~1350
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=30b7138fe12be2896a53993b308664fddbe32a3a;p=thirdparty%2FPython%2Fcpython.git

Merge from 3.5
---

30b7138fe12be2896a53993b308664fddbe32a3a