]> granicus.if.org Git - python/commitdiff
Merge heads
authorSerhiy Storchaka <storchaka@gmail.com>
Wed, 23 Jul 2014 19:12:53 +0000 (22:12 +0300)
committerSerhiy Storchaka <storchaka@gmail.com>
Wed, 23 Jul 2014 19:12:53 +0000 (22:12 +0300)

Trivial merge