From: Benjamin Peterson <benjamin@python.org>
Date: Fri, 29 May 2015 23:44:50 +0000 (-0500)
Subject: merge 3.5
X-Git-Tag: v3.5.0b2~13^2~8
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3979323ca3c6e51a194ece6d9d21b2f26a392f62;p=thirdparty%2FPython%2Fcpython.git

merge 3.5
---

3979323ca3c6e51a194ece6d9d21b2f26a392f62