From: Zachary Ware <zachary.ware@gmail.com>
Date: Wed, 17 Jun 2015 15:08:57 +0000 (-0500)
Subject: Merge 3.5
X-Git-Tag: v3.6.0a1~2067
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=84f6578b7a89573a3f8f2fb93a976ad681f7516e;p=thirdparty%2FPython%2Fcpython.git

Merge 3.5
---

84f6578b7a89573a3f8f2fb93a976ad681f7516e