From: Serhiy Storchaka <storchaka@gmail.com>
Date: Tue, 27 Jan 2015 20:32:34 +0000 (+0200)
Subject: Merge heads
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=179fe5e36e8775093b9aec5bc084e7b0b24b8c5f;p=python

Merge heads
---

179fe5e36e8775093b9aec5bc084e7b0b24b8c5f