From: Raymond Hettinger <python@rcn.com>
Date: Mon, 2 Nov 2015 05:04:46 +0000 (-0500)
Subject: merge
X-Git-Tag: v3.6.0a1~1138
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0bdf9ea136c4acca2de0fe6ab799ab35d5b09fd2;p=python

merge
---

0bdf9ea136c4acca2de0fe6ab799ab35d5b09fd2