From: Serhiy Storchaka <storchaka@gmail.com>
Date: Wed, 23 Jul 2014 19:07:37 +0000 (+0300)
Subject: Merge heads
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=58f9b57b6f57834a2291b12c1a6d65f1a1bc48c3;p=python

Merge heads
---

58f9b57b6f57834a2291b12c1a6d65f1a1bc48c3