]> granicus.if.org Git - python/commitdiff
Merge heads
authorSerhiy Storchaka <storchaka@gmail.com>
Mon, 26 Jan 2015 10:13:09 +0000 (12:13 +0200)
committerSerhiy Storchaka <storchaka@gmail.com>
Mon, 26 Jan 2015 10:13:09 +0000 (12:13 +0200)

Trivial merge