From: Raymond Hettinger <python@rcn.com>
Date: Tue, 10 Nov 2015 08:09:49 +0000 (-0800)
Subject: merge
X-Git-Tag: v3.6.0a1~1090
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=349718a20a664e5aaa1e6cbd5ea9c33bbe4fac5c;p=thirdparty%2FPython%2Fcpython.git

merge
---

349718a20a664e5aaa1e6cbd5ea9c33bbe4fac5c