]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Merge heads
authorSerhiy Storchaka <storchaka@gmail.com>
Fri, 28 Dec 2012 08:16:47 +0000 (10:16 +0200)
committerSerhiy Storchaka <storchaka@gmail.com>
Fri, 28 Dec 2012 08:16:47 +0000 (10:16 +0200)

Trivial merge