From: Brett Cannon <brett@python.org>
Date: Fri, 4 Dec 2015 22:52:07 +0000 (-0800)
Subject: Merge for issue #25500
X-Git-Tag: v3.6.0a1~960
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3ad18dc7a7a5f0613ad9ce787cd92002a556fe7b;p=thirdparty%2FPython%2Fcpython.git

Merge for issue #25500
---

3ad18dc7a7a5f0613ad9ce787cd92002a556fe7b