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

Trivial merge