]> granicus.if.org Git - python/commitdiff
Merge heads
authorSerhiy Storchaka <storchaka@gmail.com>
Fri, 9 Sep 2016 21:55:01 +0000 (00:55 +0300)
committerSerhiy Storchaka <storchaka@gmail.com>
Fri, 9 Sep 2016 21:55:01 +0000 (00:55 +0300)

Trivial merge