From: Benjamin Peterson <benjamin@python.org>
Date: Thu, 28 May 2015 19:40:15 +0000 (-0500)
Subject: merge 3.5
X-Git-Tag: v3.5.0b2~13^2~17
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0938d98bcc684b01e92112245b5868e7b920a5a2;p=python

merge 3.5
---

0938d98bcc684b01e92112245b5868e7b920a5a2