]> granicus.if.org Git - python/commitdiff
Merge heads
authorSerhiy Storchaka <storchaka@gmail.com>
Tue, 27 Jan 2015 20:32:34 +0000 (22:32 +0200)
committerSerhiy Storchaka <storchaka@gmail.com>
Tue, 27 Jan 2015 20:32:34 +0000 (22:32 +0200)

Trivial merge