From: Benjamin Peterson <benjamin@python.org>
Date: Sun, 13 Sep 2015 00:21:24 +0000 (-0700)
Subject: merge 3.5 (#25076)
X-Git-Tag: v3.6.0a1~1567
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=70343bf47d558dbfc26fc872de0504be3b2f33fe;p=thirdparty%2FPython%2Fcpython.git

merge 3.5 (#25076)
---

70343bf47d558dbfc26fc872de0504be3b2f33fe