From: Yury Selivanov <yselivanov@sprymix.com>
Date: Mon, 16 May 2016 20:23:20 +0000 (-0400)
Subject: Merge 3.5
X-Git-Tag: v3.6.0a2~287
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f979d55886b7dbbaf37ad92b62a3fcfd9cc28365;p=thirdparty%2FPython%2Fcpython.git

Merge 3.5
---

f979d55886b7dbbaf37ad92b62a3fcfd9cc28365