From: Zachary Ware <zachary.ware@gmail.com>
Date: Thu, 27 Nov 2014 05:56:10 +0000 (-0600)
Subject: Merge with 3.4
X-Git-Tag: v3.5.0a1~429
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f25e3bfefa800c20c354843b345644ac80b646a8;p=thirdparty%2FPython%2Fcpython.git

Merge with 3.4
---

f25e3bfefa800c20c354843b345644ac80b646a8