From: Raymond Hettinger <python@rcn.com>
Date: Wed, 7 Oct 2015 03:08:11 +0000 (-0400)
Subject: merge
X-Git-Tag: v3.6.0a1~1312
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6bb7b91e9432a1a13df31173a92550599e666aaa;p=python

merge
---

6bb7b91e9432a1a13df31173a92550599e666aaa