From: Yury Selivanov <yselivanov@sprymix.com>
Date: Tue, 17 Nov 2015 17:20:02 +0000 (-0500)
Subject: Merge 3.4
X-Git-Tag: v3.5.1rc1~27
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5498f2b6bf6d2ff7a1575a7a07ca1175f8226853;p=thirdparty%2FPython%2Fcpython.git

Merge 3.4
---

5498f2b6bf6d2ff7a1575a7a07ca1175f8226853