From: Raymond Hettinger <python@rcn.com>
Date: Tue, 24 Nov 2015 05:04:53 +0000 (-0800)
Subject: merge
X-Git-Tag: v3.6.0a1~994
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2831b383e9065f84212ae724da1ae6e67effeabc;p=python

merge
---

2831b383e9065f84212ae724da1ae6e67effeabc