From: Martin Panter <vadmium+py@gmail.com>
Date: Mon, 28 Sep 2015 06:28:29 +0000 (+0000)
Subject: Merge from 3.4 into 3.5; no file changes
X-Git-Tag: v3.5.1rc1~256
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=37e5d2c16410d9f6fa3c4ba02807221561c27d19;p=python

Merge from 3.4 into 3.5; no file changes
---

37e5d2c16410d9f6fa3c4ba02807221561c27d19