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

Merge 3.4
---

abe61079deeff97a8c614ddd73cc5b12530ecd6b