From: Alexander Belopolsky <alexander.belopolsky@gmail.com>
Date: Mon, 28 Sep 2015 02:34:07 +0000 (-0400)
Subject: merge
X-Git-Tag: v3.5.1rc1~256^2~2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=672be19bf3af86ba37df1a386d4a6c83085f15c2;p=python

merge
---

672be19bf3af86ba37df1a386d4a6c83085f15c2