]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Merge heads
authorSerhiy Storchaka <storchaka@gmail.com>
Thu, 19 Dec 2013 20:31:23 +0000 (22:31 +0200)
committerSerhiy Storchaka <storchaka@gmail.com>
Thu, 19 Dec 2013 20:31:23 +0000 (22:31 +0200)

Trivial merge