]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Merge heads
authorSerhiy Storchaka <storchaka@gmail.com>
Fri, 16 Dec 2016 17:05:33 +0000 (19:05 +0200)
committerSerhiy Storchaka <storchaka@gmail.com>
Fri, 16 Dec 2016 17:05:33 +0000 (19:05 +0200)

Trivial merge