]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Merge heads
authorSerhiy Storchaka <storchaka@gmail.com>
Mon, 7 Jul 2014 12:11:42 +0000 (15:11 +0300)
committerSerhiy Storchaka <storchaka@gmail.com>
Mon, 7 Jul 2014 12:11:42 +0000 (15:11 +0300)

Trivial merge