From: Benjamin Peterson <benjamin@python.org>
Date: Sat, 18 Jul 2015 18:00:19 +0000 (-0700)
Subject: merge 3.5 (#24655)
X-Git-Tag: v3.6.0a1~1957
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d830b9d3194b3a0362c1fcfd372cdee5ed1bf0af;p=thirdparty%2FPython%2Fcpython.git

merge 3.5 (#24655)
---

d830b9d3194b3a0362c1fcfd372cdee5ed1bf0af