]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Merge heads
authorSerhiy Storchaka <storchaka@gmail.com>
Wed, 22 Apr 2015 08:01:38 +0000 (11:01 +0300)
committerSerhiy Storchaka <storchaka@gmail.com>
Wed, 22 Apr 2015 08:01:38 +0000 (11:01 +0300)

Trivial merge