From: Gregory P. Smith ext:(%20%5BGoogle%20Inc.%5D) <greg@krypto.org>
Date: Fri, 3 Jun 2016 00:33:02 +0000 (+0000)
Subject: merge 3.5
X-Git-Tag: v3.6.0a2~169
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3498db1f7886b86de8d4b5de7f5ce67fef74141d;p=python

merge 3.5
---

3498db1f7886b86de8d4b5de7f5ce67fef74141d