]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Merge heads
authorSerhiy Storchaka <storchaka@gmail.com>
Sat, 2 Feb 2013 08:37:36 +0000 (10:37 +0200)
committerSerhiy Storchaka <storchaka@gmail.com>
Sat, 2 Feb 2013 08:37:36 +0000 (10:37 +0200)

Trivial merge