From: Zachary Ware <zachary.ware@gmail.com>
Date: Tue, 6 Oct 2015 20:28:56 +0000 (-0500)
Subject: Issue #25097: Merge with 3.4
X-Git-Tag: v3.5.1rc1~204
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=479ac6654c94ee16fe2bfa2acec8d3fe86ef1381;p=thirdparty%2FPython%2Fcpython.git

Issue #25097: Merge with 3.4
---

479ac6654c94ee16fe2bfa2acec8d3fe86ef1381