]> granicus.if.org Git - python/commitdiff
Merge heads
authorSerhiy Storchaka <storchaka@gmail.com>
Thu, 13 Feb 2014 08:49:30 +0000 (10:49 +0200)
committerSerhiy Storchaka <storchaka@gmail.com>
Thu, 13 Feb 2014 08:49:30 +0000 (10:49 +0200)

Trivial merge