From e854917e091db0ce692bfec66cae4aa09f4c19f5 Mon Sep 17 00:00:00 2001
From: yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 20 Jan 2009 09:53:38 +0000
Subject: merges r21679 from trunk into ruby_1_9_1. 	*
 ext/nkf/nkf-utf8/nkf.c (nkf_buf_push): maybe a bug.

	* ext/nkf/nkf-utf8/nkf.c (options): no need to support help option.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21694 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'ChangeLog')

diff --git a/ChangeLog b/ChangeLog
index fd13cab1c4..d6237c738a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Tue Jan 20 09:26:05 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ext/nkf/nkf-utf8/nkf.c (nkf_buf_push): maybe a bug.
+
+	* ext/nkf/nkf-utf8/nkf.c (options): no need to support help option.
+
 Tue Jan 20 06:48:56 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* array.c (take_items), enum.c (enum_zip): tries to convert to
-- 
cgit v1.2.3