]> granicus.if.org Git - python/commitdiff
Merge heads
authorSerhiy Storchaka <storchaka@gmail.com>
Tue, 22 Jul 2014 08:02:56 +0000 (11:02 +0300)
committerSerhiy Storchaka <storchaka@gmail.com>
Tue, 22 Jul 2014 08:02:56 +0000 (11:02 +0300)

Trivial merge