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

Merge 3.4
---

c4e27e277c6674c0a8a9301f0dbf7e9daf55fcfd