]> granicus.if.org Git - python/commitdiff
Merge heads
authorSerhiy Storchaka <storchaka@gmail.com>
Tue, 29 Jan 2013 08:40:04 +0000 (10:40 +0200)
committerSerhiy Storchaka <storchaka@gmail.com>
Tue, 29 Jan 2013 08:40:04 +0000 (10:40 +0200)

Trivial merge