From: Zachary Ware <zachary.ware@gmail.com>
Date: Tue, 7 Jul 2015 04:30:16 +0000 (-0500)
Subject: Merge 3.4
X-Git-Tag: v3.5.0b4~68
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1a7df86c46a08ef1ec548fb8f8e1f14f5a07a1af;p=thirdparty%2FPython%2Fcpython.git

Merge 3.4
---

1a7df86c46a08ef1ec548fb8f8e1f14f5a07a1af