From: Serhiy Storchaka <storchaka@gmail.com>
Date: Fri, 6 Nov 2015 09:21:02 +0000 (+0200)
Subject: Fixed merging error in 3ebeeed1eb28.
X-Git-Tag: v3.6.0a1~1112
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=501c16d1df46555dccf35d8ed6f72bac9c72d444;p=python

Fixed merging error in 3ebeeed1eb28.
Thanks Марк Коренберг.
---

501c16d1df46555dccf35d8ed6f72bac9c72d444