From: Georg Brandl <georg@python.org>
Date: Fri, 26 Feb 2016 18:14:56 +0000 (+0100)
Subject: merge with 3.5
X-Git-Tag: v3.6.0a1~562
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=def4ff6a647f00f9a995c2c6f47ad366c8847d66;p=python

merge with 3.5
---

def4ff6a647f00f9a995c2c6f47ad366c8847d66