From: Raymond Hettinger <python@rcn.com>
Date: Tue, 10 Nov 2015 08:00:17 +0000 (-0800)
Subject: merge
X-Git-Tag: v3.6.0a1~1091
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5bfb9f0b1f131859b03fde418efd5aca9a7bb85c;p=python

merge
---

5bfb9f0b1f131859b03fde418efd5aca9a7bb85c