From: Steven D'Aprano <steve@pearwood.info>
Date: Tue, 23 Aug 2016 16:40:31 +0000 (+1000)
Subject: Automated merge with ssh://hg.python.org/cpython
X-Git-Tag: v3.6.0b1~583
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9ff4fb36199f94818d97be56d0b3ab1c9e989209;p=python

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

9ff4fb36199f94818d97be56d0b3ab1c9e989209