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

Merge heads
---

12e787065024890832166ebdb3473067adeb2413