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

Trivial merge