]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Merge heads
authorSerhiy Storchaka <storchaka@gmail.com>
Mon, 29 Aug 2016 12:59:48 +0000 (15:59 +0300)
committerSerhiy Storchaka <storchaka@gmail.com>
Mon, 29 Aug 2016 12:59:48 +0000 (15:59 +0300)

Trivial merge