From: Raymond Hettinger <python@rcn.com>
Date: Sun, 6 Sep 2015 00:06:18 +0000 (-0700)
Subject: merge
X-Git-Tag: v3.6.0a1~1662
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=318c5aef0e4c01ed7b5dacd0daa0fa42b76e5b99;p=thirdparty%2FPython%2Fcpython.git

merge
---

318c5aef0e4c01ed7b5dacd0daa0fa42b76e5b99