]> granicus.if.org Git - python/commitdiff
Merge heads
authorSerhiy Storchaka <storchaka@gmail.com>
Sun, 17 Nov 2013 10:30:50 +0000 (12:30 +0200)
committerSerhiy Storchaka <storchaka@gmail.com>
Sun, 17 Nov 2013 10:30:50 +0000 (12:30 +0200)

Trivial merge