From: Zachary Ware <zachary.ware@gmail.com>
Date: Thu, 7 May 2015 01:19:35 +0000 (-0500)
Subject: Merge from 3.4.
X-Git-Tag: v3.5.0b1~230^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7a04a89ec974c66d254b4b3039c2ef06fd7b3fd8;p=thirdparty%2FPython%2Fcpython.git

Merge from 3.4.
---

7a04a89ec974c66d254b4b3039c2ef06fd7b3fd8