merge revision(s) 54423,54489: [Backport #12201] [Backport #12202]
* ext/nkf/nkf-utf8/nkf.c: Merge upstream 4f3edf80a0. patched by Anton Sivakov [Bug #12201] [Bug #12202] * ext/nkf/nkf-utf8/nkf.c (mime_putc): fix typo. [Bug #12202] [ruby-core:74802]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@54695 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
merge revision(s) 54423,54489: [Backport #12201] [Backport #12202]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@54695 b2dd03c8-39d4-4d8f-98ff-823fe69b080e