From 98a8a2dfcee500d3ddcaf67b8e486148b086c182 Mon Sep 17 00:00:00 2001
From: shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 22 May 2007 20:19:40 +0000
Subject: merge -c 12272

git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8_6@12331 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'ChangeLog')

diff --git a/ChangeLog b/ChangeLog
index 1bf55e639..cdfbbf830 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,8 @@
-Thu May 10 10:14:14 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Wed May 23 05:17:33 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ext/iconv/iconv.c (iconv_s_conv): rdoc fix.
+
+Wed May 23 05:10:02 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* eval.c (rb_thread_priority): rdoc fix; the initial value is
 	  inherited from the creating thread.  [ruby-core:10607]
-- 
cgit