]> granicus.if.org Git - python/commitdiff
Merge heads
authorSerhiy Storchaka <storchaka@gmail.com>
Sun, 15 Feb 2015 12:02:15 +0000 (14:02 +0200)
committerSerhiy Storchaka <storchaka@gmail.com>
Sun, 15 Feb 2015 12:02:15 +0000 (14:02 +0200)

Trivial merge