From: Benjamin Peterson <benjamin@python.org>
Date: Tue, 26 May 2015 02:25:27 +0000 (-0500)
Subject: Merge 3.5
X-Git-Tag: v3.5.0b2~13^2~40
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=39bdb9e60042253cf0a2c83768acaa8b0ab6e781;p=python

Merge 3.5
---

39bdb9e60042253cf0a2c83768acaa8b0ab6e781