From: Steven D'Aprano <steve@pearwood.info>
Date: Thu, 7 Jul 2016 16:52:06 +0000 (+1000)
Subject: Automated merge with ssh://hg.python.org/cpython
X-Git-Tag: v3.6.0a3~25
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d6402a40d3b52aa945dfc0a875b05510e88a2dab;p=python

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

d6402a40d3b52aa945dfc0a875b05510e88a2dab