From: Martin Panter <vadmium>
Date: Wed, 9 Sep 2015 03:46:24 +0000 (+0000)
Subject: Merge 3.6 branches
X-Git-Tag: v3.6.0a1~1631
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=696dbb1568682f8b41acee776f20b5dff9edfe26;p=thirdparty%2FPython%2Fcpython.git

Merge 3.6 branches
---

696dbb1568682f8b41acee776f20b5dff9edfe26