]> granicus.if.org Git - python/commitdiff
Merge heads
authorSerhiy Storchaka <storchaka@gmail.com>
Mon, 7 Jul 2014 10:46:09 +0000 (13:46 +0300)
committerSerhiy Storchaka <storchaka@gmail.com>
Mon, 7 Jul 2014 10:46:09 +0000 (13:46 +0300)

Trivial merge