From: Benjamin Peterson <benjamin@python.org>
Date: Sun, 10 Jan 2016 07:56:40 +0000 (-0800)
Subject: merge 3.5 (#26066)
X-Git-Tag: v3.6.0a1~804
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7e23fe1ce1d9598cc959993a90ec1fd1bdb43014;p=thirdparty%2FPython%2Fcpython.git

merge 3.5 (#26066)
---

7e23fe1ce1d9598cc959993a90ec1fd1bdb43014