]> granicus.if.org Git - python/commitdiff
Merge heads
authorSerhiy Storchaka <storchaka@gmail.com>
Mon, 24 Feb 2014 12:57:35 +0000 (14:57 +0200)
committerSerhiy Storchaka <storchaka@gmail.com>
Mon, 24 Feb 2014 12:57:35 +0000 (14:57 +0200)

Trivial merge