From: Benjamin Peterson <benjamin@python.org>
Date: Sun, 7 Jun 2015 04:20:40 +0000 (-0500)
Subject: merge 3.5
X-Git-Tag: v3.6.0a1~2099
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4a931adef38d8b4daaf7c7d6736f9806550a8bb9;p=thirdparty%2FPython%2Fcpython.git

merge 3.5
---

4a931adef38d8b4daaf7c7d6736f9806550a8bb9