From: Benjamin Peterson <benjamin@python.org>
Date: Sat, 16 Apr 2016 22:12:37 +0000 (-0700)
Subject: merge 3.5
X-Git-Tag: v3.6.0a1~186
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a4ed2daea3ac4a53759d8680d789c2e1be6591f9;p=thirdparty%2FPython%2Fcpython.git

merge 3.5
---

a4ed2daea3ac4a53759d8680d789c2e1be6591f9