]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Merge heads
authorSerhiy Storchaka <storchaka@gmail.com>
Tue, 31 Mar 2015 10:18:35 +0000 (13:18 +0300)
committerSerhiy Storchaka <storchaka@gmail.com>
Tue, 31 Mar 2015 10:18:35 +0000 (13:18 +0300)

Trivial merge