]> granicus.if.org Git - python/commitdiff
Merge heads
authorSerhiy Storchaka <storchaka@gmail.com>
Tue, 6 Oct 2015 15:39:58 +0000 (18:39 +0300)
committerSerhiy Storchaka <storchaka@gmail.com>
Tue, 6 Oct 2015 15:39:58 +0000 (18:39 +0300)

Trivial merge