]> granicus.if.org Git - python/commitdiff
Merge heads
authorSerhiy Storchaka <storchaka@gmail.com>
Sat, 2 Feb 2013 08:38:25 +0000 (10:38 +0200)
committerSerhiy Storchaka <storchaka@gmail.com>
Sat, 2 Feb 2013 08:38:25 +0000 (10:38 +0200)

Trivial merge