From: Serhiy Storchaka <storchaka@gmail.com>
Date: Sat, 4 Oct 2014 11:20:23 +0000 (+0300)
Subject: Merge heads
X-Git-Tag: v3.5.0a1~766
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bf9b1a3b13fbf50d0212f0421250966d75f46f67;p=python

Merge heads
---

bf9b1a3b13fbf50d0212f0421250966d75f46f67