From: Benjamin Peterson <benjamin@python.org>
Date: Sat, 5 Dec 2015 08:27:40 +0000 (-0800)
Subject: merge 3.5
X-Git-Tag: v3.6.0a1~950
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4be79aab2d6e390f39caa50e12ec1eb625e4bfbf;p=thirdparty%2FPython%2Fcpython.git

merge 3.5
---

4be79aab2d6e390f39caa50e12ec1eb625e4bfbf