From: Raymond Hettinger <python@rcn.com>
Date: Mon, 9 Nov 2015 16:26:28 +0000 (-0800)
Subject: merge
X-Git-Tag: v3.6.0a1~1098
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2fbde51e2f6d681d25784d763b9bc0bbc511dbb7;p=python

merge
---

2fbde51e2f6d681d25784d763b9bc0bbc511dbb7