]> granicus.if.org Git - python/commitdiff
Merge heads
authorSerhiy Storchaka <storchaka@gmail.com>
Wed, 25 Jan 2017 11:28:45 +0000 (13:28 +0200)
committerSerhiy Storchaka <storchaka@gmail.com>
Wed, 25 Jan 2017 11:28:45 +0000 (13:28 +0200)

Trivial merge