]> granicus.if.org Git - python/commitdiff
Merge heads
authorSerhiy Storchaka <storchaka@gmail.com>
Sat, 4 Oct 2014 11:20:10 +0000 (14:20 +0300)
committerSerhiy Storchaka <storchaka@gmail.com>
Sat, 4 Oct 2014 11:20:10 +0000 (14:20 +0300)

Trivial merge