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

merge 3.5 (#24610)
---

de2691d6f7fa2820788c3195714f814cf6a2ba74