]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Merge heads
authorSerhiy Storchaka <storchaka@gmail.com>
Sun, 12 Oct 2014 14:15:56 +0000 (17:15 +0300)
committerSerhiy Storchaka <storchaka@gmail.com>
Sun, 12 Oct 2014 14:15:56 +0000 (17:15 +0300)

Trivial merge