]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Merge heads
authorSerhiy Storchaka <storchaka@gmail.com>
Tue, 15 Jan 2013 13:32:59 +0000 (15:32 +0200)
committerSerhiy Storchaka <storchaka@gmail.com>
Tue, 15 Jan 2013 13:32:59 +0000 (15:32 +0200)

Trivial merge