From: Brett Cannon <brett@python.org>
Date: Wed, 7 Sep 2016 00:16:41 +0000 (-0700)
Subject: Merge
X-Git-Tag: v3.6.0b1~378
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=aee52ccc8501402a77f27dc1de7859feff85e038;p=thirdparty%2FPython%2Fcpython.git

Merge
---

aee52ccc8501402a77f27dc1de7859feff85e038