From: Raymond Hettinger <python@rcn.com>
Date: Tue, 24 Nov 2015 04:43:56 +0000 (-0800)
Subject: merge
X-Git-Tag: v3.6.0a1~995
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a89013d9300e13062da465ff671f97efa0ab88a3;p=thirdparty%2FPython%2Fcpython.git

merge
---

a89013d9300e13062da465ff671f97efa0ab88a3