]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Merge heads
authorSerhiy Storchaka <storchaka@gmail.com>
Mon, 26 Jan 2015 08:27:31 +0000 (10:27 +0200)
committerSerhiy Storchaka <storchaka@gmail.com>
Mon, 26 Jan 2015 08:27:31 +0000 (10:27 +0200)

Trivial merge