]> granicus.if.org Git - python/commitdiff
Merge heads
authorSerhiy Storchaka <storchaka@gmail.com>
Fri, 10 Apr 2015 13:18:33 +0000 (16:18 +0300)
committerSerhiy Storchaka <storchaka@gmail.com>
Fri, 10 Apr 2015 13:18:33 +0000 (16:18 +0300)

Trivial merge