From: Raymond Hettinger <python@rcn.com>
Date: Wed, 27 Jan 2016 05:46:03 +0000 (-0800)
Subject: merge
X-Git-Tag: v3.6.0a1~691
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0ef0423cb2af178022991e9f3bfc276a2c3e1358;p=python

merge
---

0ef0423cb2af178022991e9f3bfc276a2c3e1358