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

Trivial merge