From: Raymond Hettinger <python@rcn.com>
Date: Mon, 20 Jul 2015 07:11:16 +0000 (-0400)
Subject: merge
X-Git-Tag: v3.6.0a1~1951
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=aa23fa2e21677c21f5727e6c2602a8bbf67d7fe4;p=python

merge
---

aa23fa2e21677c21f5727e6c2602a8bbf67d7fe4