From: Zachary Ware <zachary.ware@gmail.com>
Date: Sat, 5 Dec 2015 06:18:29 +0000 (-0600)
Subject: Issue #25800: Merge with 3.4
X-Git-Tag: v3.6.0a1~952^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2356069d94ace825895028a85e07959e6f7fda35;p=thirdparty%2FPython%2Fcpython.git

Issue #25800: Merge with 3.4
---

2356069d94ace825895028a85e07959e6f7fda35