]> granicus.if.org Git - python/commitdiff
Merge heads
authorSerhiy Storchaka <storchaka@gmail.com>
Thu, 5 Sep 2013 14:32:15 +0000 (17:32 +0300)
committerSerhiy Storchaka <storchaka@gmail.com>
Thu, 5 Sep 2013 14:32:15 +0000 (17:32 +0300)

Trivial merge