]> granicus.if.org Git - python/commitdiff
Merge heads
authorSerhiy Storchaka <storchaka@gmail.com>
Fri, 16 Dec 2016 17:06:17 +0000 (19:06 +0200)
committerSerhiy Storchaka <storchaka@gmail.com>
Fri, 16 Dec 2016 17:06:17 +0000 (19:06 +0200)

Trivial merge