]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Merge heads
authorSerhiy Storchaka <storchaka@gmail.com>
Thu, 16 Jan 2014 15:20:02 +0000 (17:20 +0200)
committerSerhiy Storchaka <storchaka@gmail.com>
Thu, 16 Jan 2014 15:20:02 +0000 (17:20 +0200)

Trivial merge