]> granicus.if.org Git - python/commitdiff
Merge heads
authorSerhiy Storchaka <storchaka@gmail.com>
Mon, 3 Feb 2014 19:36:17 +0000 (21:36 +0200)
committerSerhiy Storchaka <storchaka@gmail.com>
Mon, 3 Feb 2014 19:36:17 +0000 (21:36 +0200)

Trivial merge