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

Merge with 3.4
---

9b4cc6bc6b5af18e2f90adc2ef0c81847edbd8c5