From: Yury Selivanov <yselivanov@sprymix.com>
Date: Tue, 15 Apr 2014 16:01:57 +0000 (-0400)
Subject: merge 3.4
X-Git-Tag: v3.5.0a1~1865
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=cec96144755bc75bc82d34a27e17ebe4eb300992;p=thirdparty%2FPython%2Fcpython.git

merge 3.4
---

cec96144755bc75bc82d34a27e17ebe4eb300992