]> granicus.if.org Git - python/commitdiff
Merge heads
authorSerhiy Storchaka <storchaka@gmail.com>
Mon, 16 Dec 2013 13:16:35 +0000 (15:16 +0200)
committerSerhiy Storchaka <storchaka@gmail.com>
Mon, 16 Dec 2013 13:16:35 +0000 (15:16 +0200)

Trivial merge