]> granicus.if.org Git - python/commitdiff
Merge heads
authorSerhiy Storchaka <storchaka@gmail.com>
Mon, 28 Dec 2015 22:01:31 +0000 (00:01 +0200)
committerSerhiy Storchaka <storchaka@gmail.com>
Mon, 28 Dec 2015 22:01:31 +0000 (00:01 +0200)

Trivial merge