From: Yury Selivanov <yselivanov@sprymix.com>
Date: Mon, 8 Dec 2014 17:40:53 +0000 (-0500)
Subject: null merge with 3.4.
X-Git-Tag: v3.5.0a1~359
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a49d6a213e936bc1dcf3bbf098623e86599e59b5;p=thirdparty%2FPython%2Fcpython.git

null merge with 3.4.
---

a49d6a213e936bc1dcf3bbf098623e86599e59b5