From: Andrew Svetlov <andrew.svetlov@gmail.com>
Date: Thu, 1 Oct 2015 06:48:36 +0000 (+0300)
Subject: Merge 3.4 -> 3.5
X-Git-Tag: v3.5.1rc1~236
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=313242aa03aed2ebdaa0dd47428b60b68d8a4e78;p=thirdparty%2FPython%2Fcpython.git

Merge 3.4 -> 3.5
---

313242aa03aed2ebdaa0dd47428b60b68d8a4e78