From: Eric Snow <ericsnowcurrently@gmail.com>
Date: Wed, 3 Jun 2015 17:11:22 +0000 (-0600)
Subject: Merge from 3.5.
X-Git-Tag: v3.6.0a1~2111
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d8e5d6c4a5c0be047e3b7c53f5954bd3a3a34af6;p=thirdparty%2FPython%2Fcpython.git

Merge from 3.5.
---

d8e5d6c4a5c0be047e3b7c53f5954bd3a3a34af6