]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Merge heads
authorSerhiy Storchaka <storchaka@gmail.com>
Thu, 12 Jan 2017 17:42:44 +0000 (19:42 +0200)
committerSerhiy Storchaka <storchaka@gmail.com>
Thu, 12 Jan 2017 17:42:44 +0000 (19:42 +0200)

Trivial merge