]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge
authorAlexander Belopolsky <alexander.belopolsky@gmail.com>
Mon, 28 Sep 2015 02:34:07 +0000 (22:34 -0400)
committerAlexander Belopolsky <alexander.belopolsky@gmail.com>
Mon, 28 Sep 2015 02:34:07 +0000 (22:34 -0400)

Trivial merge