From: Serhiy Storchaka <storchaka@gmail.com>
Date: Sun, 17 Nov 2013 10:31:29 +0000 (+0200)
Subject: Merge heads
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ae75c83f1af5d90d535ddde30ca95258e55f649e;p=python

Merge heads
---

ae75c83f1af5d90d535ddde30ca95258e55f649e