]> granicus.if.org Git - python/commitdiff
Merge heads
authorSerhiy Storchaka <storchaka@gmail.com>
Fri, 30 Sep 2016 07:39:12 +0000 (10:39 +0300)
committerSerhiy Storchaka <storchaka@gmail.com>
Fri, 30 Sep 2016 07:39:12 +0000 (10:39 +0300)

Trivial merge