From: Steven D'Aprano <steve@pearwood.info>
Date: Tue, 4 Oct 2016 16:25:05 +0000 (+1100)
Subject: Automated merge with ssh://hg.python.org/cpython
X-Git-Tag: v3.7.0a1~2306
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a6017786e9269cc1f13b5e0e62449693190968fa;p=python

Automated merge with ssh://hg.python.org/cpython
---

a6017786e9269cc1f13b5e0e62449693190968fa