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

Trivial merge