]> granicus.if.org Git - python/commitdiff
Merge heads
authorSerhiy Storchaka <storchaka@gmail.com>
Sun, 10 Jul 2016 18:34:05 +0000 (21:34 +0300)
committerSerhiy Storchaka <storchaka@gmail.com>
Sun, 10 Jul 2016 18:34:05 +0000 (21:34 +0300)

Trivial merge