From: Benjamin Peterson <benjamin@python.org>
Date: Tue, 17 May 2016 05:54:21 +0000 (-0700)
Subject: null merge 3.5
X-Git-Tag: v3.6.0a2~281
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c01d21e3aa12823a8ad8e23bb51e835091c6fc64;p=thirdparty%2FPython%2Fcpython.git

null merge 3.5
---

c01d21e3aa12823a8ad8e23bb51e835091c6fc64