From: Raymond Hettinger <python@rcn.com>
Date: Tue, 28 Jul 2015 09:07:14 +0000 (-0700)
Subject: merge
X-Git-Tag: v3.6.0a1~1896^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d2117e18a06a0e339f50a0a2c3c412710a45b77a;p=python

merge
---

d2117e18a06a0e339f50a0a2c3c412710a45b77a