From: Benjamin Peterson <benjamin@python.org>
Date: Fri, 1 Jan 2016 17:56:35 +0000 (-0600)
Subject: merge 3.5
X-Git-Tag: v3.6.0a1~833
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3e47a1337c0faa31ee97830f17fa12b850632811;p=python

merge 3.5
---

3e47a1337c0faa31ee97830f17fa12b850632811