From: Benjamin Peterson <benjamin@python.org>
Date: Tue, 29 Dec 2015 16:08:51 +0000 (-0600)
Subject: merge 3.5 (#25973)
X-Git-Tag: v3.6.0a1~842
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5aab44b301fff2c6a7f00e24944a3360eedd7aa8;p=thirdparty%2FPython%2Fcpython.git

merge 3.5 (#25973)
---

5aab44b301fff2c6a7f00e24944a3360eedd7aa8