From: Raymond Hettinger <python@rcn.com>
Date: Sat, 31 Dec 2016 19:02:42 +0000 (-0700)
Subject: merge
X-Git-Tag: v3.6.1rc1~232
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a67619ec5f0719daa14240469872ecff9596673e;p=thirdparty%2FPython%2Fcpython.git

merge
---

a67619ec5f0719daa14240469872ecff9596673e