merges r23745 from trunk into ruby_1_9_1.

--
* encoding.c (rb_enc_name_list): update RDoc.  [ruby-core:23926]

git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@23805 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 4 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index d79322a51..6a22cda35 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Fri Jun 19 20:53:54 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* encoding.c (rb_enc_name_list): update RDoc.  [ruby-core:23926]
+
 Fri Jun 19 20:44:45 2009  Tadayoshi Funaba  <tadf@dotrb.org>
 
 	* complex.c: constant COMPLEX_NAME has been removed.