From: Raymond Hettinger <python@rcn.com>
Date: Tue, 28 Jul 2015 09:08:00 +0000 (-0700)
Subject: merge
X-Git-Tag: v3.6.0a1~1896
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0ffc48ece9e6e4493e9bf02558988bae78575dae;p=python

merge
---

0ffc48ece9e6e4493e9bf02558988bae78575dae