From: Yury Selivanov <yselivanov@sprymix.com>
Date: Wed, 24 Jun 2015 13:41:56 +0000 (-0400)
Subject: Merge 3.4
X-Git-Tag: v3.5.0b3~52
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3bdbcedfd948bf66a3e2bdaf8180c8e7a262db5f;p=thirdparty%2FPython%2Fcpython.git

Merge 3.4
---

3bdbcedfd948bf66a3e2bdaf8180c8e7a262db5f