From: Brett Cannon <brett@python.org>
Date: Sun, 27 Dec 2015 20:09:10 +0000 (-0800)
Subject: Merge for issue #25874
X-Git-Tag: v3.6.0a1~858
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0792451ea49f53ac5832d5f489d68c32190a5de0;p=thirdparty%2FPython%2Fcpython.git

Merge for issue #25874
---

0792451ea49f53ac5832d5f489d68c32190a5de0