From: Raymond Hettinger <python@rcn.com>
Date: Sun, 13 Mar 2016 06:58:44 +0000 (-0800)
Subject: merge
X-Git-Tag: v3.6.0a1~492
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7dc830e988b80fcdb4a3f67c4d86d4a5c70aaf85;p=python

merge
---

7dc830e988b80fcdb4a3f67c4d86d4a5c70aaf85