]> granicus.if.org Git - python/commitdiff
Merge heads
authorSerhiy Storchaka <storchaka@gmail.com>
Tue, 23 Sep 2014 20:23:41 +0000 (23:23 +0300)
committerSerhiy Storchaka <storchaka@gmail.com>
Tue, 23 Sep 2014 20:23:41 +0000 (23:23 +0300)

Trivial merge