From: Zachary Ware <zachary.ware@gmail.com>
Date: Thu, 12 Nov 2015 05:33:50 +0000 (-0600)
Subject: Merge with 3.4
X-Git-Tag: v3.5.1rc1~60
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a99ab63d06f422efad1c6b4669b955172ef1f62a;p=thirdparty%2FPython%2Fcpython.git

Merge with 3.4
---

a99ab63d06f422efad1c6b4669b955172ef1f62a