From: Berker Peksag <berker.peksag@gmail.com>
Date: Sun, 12 Jun 2016 19:35:10 +0000 (+0300)
Subject: Merge from 3.5
X-Git-Tag: v3.6.0a2~12
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7670e3c12ec4d0c08db6b9ac82ebd5279b5f9da2;p=thirdparty%2FPython%2Fcpython.git

Merge from 3.5
---

7670e3c12ec4d0c08db6b9ac82ebd5279b5f9da2