]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Merge heads
authorSerhiy Storchaka <storchaka@gmail.com>
Tue, 25 Oct 2016 10:47:41 +0000 (13:47 +0300)
committerSerhiy Storchaka <storchaka@gmail.com>
Tue, 25 Oct 2016 10:47:41 +0000 (13:47 +0300)

Trivial merge