From: Zachary Ware <zachary.ware@gmail.com>
Date: Tue, 19 Apr 2016 16:49:56 +0000 (-0500)
Subject: Merge with 3.5
X-Git-Tag: v3.6.0a1~167
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=edaf8653c682fef24cd80fc293091848f736dd90;p=thirdparty%2FPython%2Fcpython.git

Merge with 3.5
---

edaf8653c682fef24cd80fc293091848f736dd90