From: Raymond Hettinger <python@rcn.com>
Date: Wed, 17 Dec 2014 02:17:18 +0000 (-0800)
Subject: merge
X-Git-Tag: v3.5.0a1~299
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3339f68141066aba266b48c545b62f452908695f;p=python

merge
---

3339f68141066aba266b48c545b62f452908695f