]> granicus.if.org Git - python/commitdiff
Merge heads
authorSerhiy Storchaka <storchaka@gmail.com>
Thu, 12 Jan 2017 17:46:11 +0000 (19:46 +0200)
committerSerhiy Storchaka <storchaka@gmail.com>
Thu, 12 Jan 2017 17:46:11 +0000 (19:46 +0200)

Trivial merge