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

Trivial merge