From: Eric Snow <ericsnowcurrently@gmail.com>
Date: Sat, 30 May 2015 04:34:01 +0000 (-0600)
Subject: Merge from 3.5
X-Git-Tag: v3.5.0b2~13^2~6
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c872d4e66a0626ed1ebcf6911274d72bdec9dad2;p=thirdparty%2FPython%2Fcpython.git

Merge from 3.5
---

c872d4e66a0626ed1ebcf6911274d72bdec9dad2