From: Yury Selivanov <yselivanov@sprymix.com>
Date: Mon, 8 Dec 2014 17:40:53 +0000 (-0500)
Subject: null merge with 3.4.
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a49d6a213e936bc1dcf3bbf098623e86599e59b5;p=python

null merge with 3.4.
---

a49d6a213e936bc1dcf3bbf098623e86599e59b5