]> granicus.if.org Git - python/commitdiff
Merge heads
authorSerhiy Storchaka <storchaka@gmail.com>
Sun, 13 Oct 2013 20:27:23 +0000 (23:27 +0300)
committerSerhiy Storchaka <storchaka@gmail.com>
Sun, 13 Oct 2013 20:27:23 +0000 (23:27 +0300)

Trivial merge