From: Benjamin Peterson <benjamin@python.org>
Date: Fri, 30 Oct 2015 03:40:34 +0000 (-0700)
Subject: merge 3.5 (#25515)
X-Git-Tag: v3.6.0a1~1153
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4b24d63407213bbb2f0ed09e69362843502fec00;p=thirdparty%2FPython%2Fcpython.git

merge 3.5 (#25515)
---

4b24d63407213bbb2f0ed09e69362843502fec00