From: Berker Peksag <berker.peksag@gmail.com>
Date: Tue, 14 Jun 2016 09:51:28 +0000 (+0300)
Subject: Merge from 3.5
X-Git-Tag: v3.6.0a3~153
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4762d5d5d1d5d5f2ddd113ff92e4e342a7e47a90;p=thirdparty%2FPython%2Fcpython.git

Merge from 3.5
---

4762d5d5d1d5d5f2ddd113ff92e4e342a7e47a90