]> granicus.if.org Git - python/commitdiff
Merge heads
authorSerhiy Storchaka <storchaka@gmail.com>
Sat, 2 Nov 2013 08:47:57 +0000 (10:47 +0200)
committerSerhiy Storchaka <storchaka@gmail.com>
Sat, 2 Nov 2013 08:47:57 +0000 (10:47 +0200)

Trivial merge