From: Raymond Hettinger <python@rcn.com>
Date: Tue, 1 Sep 2015 09:33:20 +0000 (-0700)
Subject: merge
X-Git-Tag: v3.6.0a1~1717
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=799b05b0527d6a8c24b453d683e38a37f774d61b;p=python

merge
---

799b05b0527d6a8c24b453d683e38a37f774d61b