]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Merge heads
authorSerhiy Storchaka <storchaka@gmail.com>
Tue, 11 Nov 2014 07:45:55 +0000 (09:45 +0200)
committerSerhiy Storchaka <storchaka@gmail.com>
Tue, 11 Nov 2014 07:45:55 +0000 (09:45 +0200)

Trivial merge