]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Merge heads
authorSerhiy Storchaka <storchaka@gmail.com>
Fri, 10 Apr 2015 13:21:58 +0000 (16:21 +0300)
committerSerhiy Storchaka <storchaka@gmail.com>
Fri, 10 Apr 2015 13:21:58 +0000 (16:21 +0300)

Trivial merge