From: Steven D'Aprano <steve@pearwood.info>
Date: Sun, 17 Apr 2016 03:14:48 +0000 (+1000)
Subject: Automated merge with ssh://hg.python.org/cpython
X-Git-Tag: v3.6.0a1~182
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5562563dd4a745ecac8e6830b2a15042beb5dd47;p=thirdparty%2FPython%2Fcpython.git

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

5562563dd4a745ecac8e6830b2a15042beb5dd47