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

Trivial merge