]> granicus.if.org Git - python/commitdiff
Merge heads
authorSerhiy Storchaka <storchaka@gmail.com>
Mon, 24 Oct 2016 11:53:25 +0000 (14:53 +0300)
committerSerhiy Storchaka <storchaka@gmail.com>
Mon, 24 Oct 2016 11:53:25 +0000 (14:53 +0300)

Trivial merge