From: Benjamin Peterson <benjamin@python.org>
Date: Thu, 2 Jun 2016 19:42:40 +0000 (-0700)
Subject: merge 3.5
X-Git-Tag: v3.6.0a2~180
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=59ae8ec75fbfce4c76620639245318548b772edd;p=thirdparty%2FPython%2Fcpython.git

merge 3.5
---

59ae8ec75fbfce4c76620639245318548b772edd