]> granicus.if.org Git - python/commitdiff
Merge heads
authorSerhiy Storchaka <storchaka@gmail.com>
Fri, 23 Aug 2013 21:42:54 +0000 (00:42 +0300)
committerSerhiy Storchaka <storchaka@gmail.com>
Fri, 23 Aug 2013 21:42:54 +0000 (00:42 +0300)

Trivial merge