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

Trivial merge