shyouhei	2008-06-08 03:28:35 +0900 (Sun, 08 Jun 2008)

  New Revision: 16925

  Modified files:
    branches/ruby_1_8_5/ChangeLog
    branches/ruby_1_8_5/lib/rexml/encodings/SHIFT-JIS.rb
    branches/ruby_1_8_5/version.h

  Log:
    merge revision(s) 13830:
    * lib/rexml/encodings/SHIFT-JIS.rb (REXML::Encoding): place -x for
      nkf conversion.  a patch from <moonwolf AT moonwolf.com>.
      [ruby-dev:32183]


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/version.h?r1=16925&r2=16924&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/lib/rexml/encodings/SHIFT-JIS.rb?r1=16925&r2=16924&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/ChangeLog?r1=16925&r2=16924&diff_format=u