From: Serhiy Storchaka <storchaka@gmail.com>
Date: Sun, 12 Oct 2014 14:15:56 +0000 (+0300)
Subject: Merge heads
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fb29e3527498a22caca6a4fc563cf868fa8c7b0c;p=python

Merge heads
---

fb29e3527498a22caca6a4fc563cf868fa8c7b0c