From: Benjamin Peterson <benjamin@python.org>
Date: Sat, 6 Jun 2015 02:03:52 +0000 (-0500)
Subject: merge 3.5
X-Git-Tag: v3.6.0a1~2100
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7da065895999059bbf5620a7523ba508a6538007;p=python

merge 3.5
---

7da065895999059bbf5620a7523ba508a6538007