From: Benjamin Peterson <benjamin@python.org>
Date: Sun, 11 Oct 2015 02:36:51 +0000 (-0700)
Subject: merge 3.5 (#25362)
X-Git-Tag: v3.6.0a1~1269
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=10dcff7a0415b302d5eb8de8e7763c7eab85e3dc;p=thirdparty%2FPython%2Fcpython.git

merge 3.5 (#25362)
---

10dcff7a0415b302d5eb8de8e7763c7eab85e3dc