From: Serhiy Storchaka <storchaka@gmail.com>
Date: Sat, 4 Jun 2016 20:30:24 +0000 (+0300)
Subject: Merge heads
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=75c6b9bdf6defdb80e69abe6c38a069225393af6;p=python

Merge heads
---

75c6b9bdf6defdb80e69abe6c38a069225393af6