yugui	2010-05-16 20:35:27 +0900 (Sun, 16 May 2010)

  New Revision: 27825

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=27825

  Log:
    merges r27723 from trunk into ruby_1_9_2.
    --
    * ext/psych/parser.c (parse): Return strings encoded as
      Encoding.default_internal if set.
    * test/psych/test_encoding.rb: Tests for encoding change.

  Modified files:
    branches/ruby_1_9_2/ChangeLog

Index: ruby_1_9_2/ChangeLog
===================================================================
--- ruby_1_9_2/ChangeLog	(revision 27824)
+++ ruby_1_9_2/ChangeLog	(revision 27825)
@@ -1,3 +1,8 @@
+Tue May 11 01:20:43 2010  Aaron Patterson <aaron@t...>
+
+	* ext/psych/parser.c (parse): Return strings encoded as
+	  Encoding.default_internal if set.
+
 Mon May 10 06:59:19 2010  NARUSE, Yui  <naruse@r...>
 
 	* common.mk (rdoc): rdoc should depend main. Moreover when XRUBY

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/