]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Merge heads
authorSerhiy Storchaka <storchaka@gmail.com>
Sun, 17 Nov 2013 10:31:29 +0000 (12:31 +0200)
committerSerhiy Storchaka <storchaka@gmail.com>
Sun, 17 Nov 2013 10:31:29 +0000 (12:31 +0200)

Trivial merge