From: Yury Selivanov <yselivanov@sprymix.com>
Date: Thu, 25 Sep 2014 16:13:41 +0000 (-0400)
Subject: merge 3.4
X-Git-Tag: v3.5.0a1~852
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=148405a9b0fe2c7daaf141b1d025d863aefc4d72;p=python

merge 3.4
---

148405a9b0fe2c7daaf141b1d025d863aefc4d72