From: Victor Stinner <victor.stinner@gmail.com>
Date: Fri, 23 Oct 2015 10:39:20 +0000 (+0200)
Subject: Merge 3.4 (Issue #25461)
X-Git-Tag: v3.6.0a1~1174
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4487a46727b90dcce47efd9f000f842ff59fba1d;p=thirdparty%2FPython%2Fcpython.git

Merge 3.4 (Issue #25461)
---

4487a46727b90dcce47efd9f000f842ff59fba1d