From: Benjamin Peterson <benjamin@python.org>
Date: Fri, 29 May 2015 22:11:36 +0000 (-0500)
Subject: merge 3.5 (#24328)
X-Git-Tag: v3.5.0b2~13^2~9
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0c70ca9aacde6fc58afc211493fa178a27cf8866;p=python

merge 3.5 (#24328)
---

0c70ca9aacde6fc58afc211493fa178a27cf8866