From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Sun, 13 Mar 2016 09:41:45 +0000 (+0200)
Subject: #24918: merge with 3.5.
X-Git-Tag: v3.6.0a1~489
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4c9375b65f4788b73cfa46f3daa94143b49273fa;p=thirdparty%2FPython%2Fcpython.git

#24918: merge with 3.5.
---

4c9375b65f4788b73cfa46f3daa94143b49273fa