From: Raymond Hettinger <python@rcn.com>
Date: Sat, 29 Oct 2016 23:57:09 +0000 (-0700)
Subject: merge
X-Git-Tag: v3.7.0a1~2099
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ba25f6149052aea017df5fa328867d090bb89d1c;p=thirdparty%2FPython%2Fcpython.git

merge
---

ba25f6149052aea017df5fa328867d090bb89d1c