From: Raymond Hettinger <python@rcn.com>
Date: Tue, 22 Nov 2016 00:59:30 +0000 (-0800)
Subject: merge
X-Git-Tag: v3.7.0a1~1902
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=21fb9f17619f8b360d2444b098f0fba511969df4;p=thirdparty%2FPython%2Fcpython.git

merge
---

21fb9f17619f8b360d2444b098f0fba511969df4