From: Raymond Hettinger <python@rcn.com>
Date: Sun, 14 Jun 2015 23:08:59 +0000 (-0700)
Subject: merge
X-Git-Tag: v3.6.0a1~2072
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bed1e7ecc73810ef7a0f079d18bc36fe37ed7722;p=python

merge
---

bed1e7ecc73810ef7a0f079d18bc36fe37ed7722