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

Merge with 3.5
---

3211595bef0c13d10c814d7dd35a96810e66c8d3