From: Benjamin Peterson <benjamin@python.org>
Date: Sun, 7 Jun 2015 05:00:48 +0000 (-0500)
Subject: Merge 3.5
X-Git-Tag: v3.6.0a1~2098
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=239e90196e609a3e1ba2fc10528a1a5df3bf0911;p=python

Merge 3.5
---

239e90196e609a3e1ba2fc10528a1a5df3bf0911