]> granicus.if.org Git - python/commitdiff
Merge heads
authorSerhiy Storchaka <storchaka@gmail.com>
Sat, 4 Jun 2016 20:30:53 +0000 (23:30 +0300)
committerSerhiy Storchaka <storchaka@gmail.com>
Sat, 4 Jun 2016 20:30:53 +0000 (23:30 +0300)

Trivial merge