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

Merge from 3.5
---

7fb468bf3e284c1b9609c98af0401ce3cda20064