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

#25687: merge with 3.5.
---

0ce835fc7e68c8768948bdc201b2f955d0b34d5a