From: Raymond Hettinger <python@rcn.com>
Date: Sun, 17 May 2015 21:47:00 +0000 (-0700)
Subject: merge
X-Git-Tag: v3.5.0b1~91
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=740d6134f15cd9641a7c9d953269a07a99d02a2b;p=python

merge
---

740d6134f15cd9641a7c9d953269a07a99d02a2b