From: Benjamin Peterson <benjamin@python.org>
Date: Wed, 27 May 2015 23:32:53 +0000 (-0500)
Subject: merge 3.5
X-Git-Tag: v3.5.0b2~13^2~28
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fa0e7f67ab80b307fa0c3202ed4ed0e2874499ca;p=python

merge 3.5
---

fa0e7f67ab80b307fa0c3202ed4ed0e2874499ca