From: Alexander Belopolsky <alexander.belopolsky@gmail.com>
Date: Sat, 28 Feb 2015 15:46:00 +0000 (-0500)
Subject: merge
X-Git-Tag: v3.5.0a2~67
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e92951f8da5747f5fd00c7388d9fd8e811422cb3;p=python

merge
---

e92951f8da5747f5fd00c7388d9fd8e811422cb3