From: Martin Panter <vadmium+py@gmail.com>
Date: Mon, 28 Sep 2015 06:30:43 +0000 (+0000)
Subject: Merge from 3.5; no file changes
X-Git-Tag: v3.6.0a1~1416
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a4802a16faf11ecc7cccb94ddf595f8a2eb11028;p=python

Merge from 3.5; no file changes
---

a4802a16faf11ecc7cccb94ddf595f8a2eb11028