From: Brett Cannon <brett@python.org>
Date: Fri, 21 Mar 2014 15:01:02 +0000 (-0400)
Subject: Merge for issue #20884
X-Git-Tag: v3.5.0a1~2061
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5d8a2444bf4787dacd48517f19ac28c6ff304380;p=thirdparty%2FPython%2Fcpython.git

Merge for issue #20884
---

5d8a2444bf4787dacd48517f19ac28c6ff304380