From: Serhiy Storchaka <storchaka@gmail.com>
Date: Sun, 2 Nov 2014 17:26:28 +0000 (+0200)
Subject: Merge heads
X-Git-Tag: v3.5.0a1~537
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bb019eb4c1fc68cb2c83110306d4b4ff80355cd4;p=python

Merge heads
---

bb019eb4c1fc68cb2c83110306d4b4ff80355cd4