]> granicus.if.org Git - python/commitdiff
Merge heads
authorSerhiy Storchaka <storchaka@gmail.com>
Thu, 28 Jan 2016 17:56:40 +0000 (19:56 +0200)
committerSerhiy Storchaka <storchaka@gmail.com>
Thu, 28 Jan 2016 17:56:40 +0000 (19:56 +0200)

Trivial merge