From: Serhiy Storchaka <storchaka@gmail.com>
Date: Wed, 22 Apr 2015 08:01:38 +0000 (+0300)
Subject: Merge heads
X-Git-Tag: v3.5.0b1~308
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=949c416dc61faa6dad398bc5a34781ff152ddc23;p=python

Merge heads
---

949c416dc61faa6dad398bc5a34781ff152ddc23