From: Ned Deily <nad@python.org>
Date: Wed, 24 Feb 2016 14:35:21 +0000 (+1100)
Subject: Issue #25136: merge from 3.5
X-Git-Tag: v3.6.0a1~573
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3ece994f9d044449f4b588400eed70f8ca1b21d2;p=thirdparty%2FPython%2Fcpython.git

Issue #25136: merge from 3.5
---

3ece994f9d044449f4b588400eed70f8ca1b21d2