From: Yury Selivanov <yselivanov@sprymix.com>
Date: Thu, 17 Dec 2015 01:23:37 +0000 (-0500)
Subject: Merge 3.4
X-Git-Tag: v3.6.0a1~900^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=152c408ed66ee0b15b7a5a9399e67f2d182b1585;p=thirdparty%2FPython%2Fcpython.git

Merge 3.4
---

152c408ed66ee0b15b7a5a9399e67f2d182b1585