]> granicus.if.org Git - python/commitdiff
Merge heads
authorSerhiy Storchaka <storchaka@gmail.com>
Sat, 3 Aug 2013 16:28:28 +0000 (19:28 +0300)
committerSerhiy Storchaka <storchaka@gmail.com>
Sat, 3 Aug 2013 16:28:28 +0000 (19:28 +0300)

Trivial merge