From: Brett Cannon <brett@python.org>
Date: Fri, 9 Oct 2015 22:10:10 +0000 (-0700)
Subject: Merge for issue #25099
X-Git-Tag: v3.6.0a1~1281
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6381e06d97a6aa78da9060ce76fdf1356ca34388;p=thirdparty%2FPython%2Fcpython.git

Merge for issue #25099
---

6381e06d97a6aa78da9060ce76fdf1356ca34388