From: Yury Selivanov <yselivanov@sprymix.com>
Date: Tue, 4 Aug 2015 19:56:53 +0000 (-0400)
Subject: Merge 3.4
X-Git-Tag: v3.5.0rc1~37
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=78c89eb0aceeeaf67f537b8f6df8a3640acf4151;p=thirdparty%2FPython%2Fcpython.git

Merge 3.4
---

78c89eb0aceeeaf67f537b8f6df8a3640acf4151