From: Zachary Ware <zachary.ware@gmail.com>
Date: Thu, 6 Aug 2015 05:04:23 +0000 (-0500)
Subject: Issue #21279: Merge with 3.4
X-Git-Tag: v3.5.0rc1~18
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d987a81d29a16215fff6dd9670cedbcdac82d1b0;p=thirdparty%2FPython%2Fcpython.git

Issue #21279: Merge with 3.4
---

d987a81d29a16215fff6dd9670cedbcdac82d1b0