From: Martin Panter <vadmium+py@gmail.com>
Date: Fri, 26 Feb 2016 00:42:33 +0000 (+0000)
Subject: Dummy merge with 3.5
X-Git-Tag: v3.6.0a1~566
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7812dbccf07a4c92268aaf1e9970a1ece536c212;p=python

Dummy merge with 3.5
---

7812dbccf07a4c92268aaf1e9970a1ece536c212