From: Jason R. Coombs <jaraco@jaraco.com>
Date: Fri, 2 Sep 2016 03:29:04 +0000 (-0400)
Subject: Issue #12885: Merge with 3.4, retaining commits reverted there.
X-Git-Tag: v3.6.0b1~497^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=22c108f0194e1e75e359b9861af28c33fe55a795;p=thirdparty%2FPython%2Fcpython.git

Issue #12885: Merge with 3.4, retaining commits reverted there.
---

22c108f0194e1e75e359b9861af28c33fe55a795