From 1d7cfff09b59c1ca226777f7e50c90050249214e Mon Sep 17 00:00:00 2001
From: naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 29 Mar 2016 16:57:33 +0000
Subject: * ext/nkf/nkf-utf8/nkf.c: Merge upstream 4f3edf80a0.   patched by
 Anton Sivakov [Bug #12201] [Bug #12202]

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

(limited to 'ChangeLog')

diff --git a/ChangeLog b/ChangeLog
index 9e601fc5e6..922d99a492 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Mar 30 01:56:06 2016  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/nkf/nkf-utf8/nkf.c: Merge upstream 4f3edf80a0.
+	  patched by Anton Sivakov [Bug #12201] [Bug #12202]
+
 Wed Mar 30 01:54:30 2016  NARUSE, Yui  <naruse@ruby-lang.org>
 
 	* tool/redmine-backporter.rb: add given revision to current changests
-- 
cgit v1.2.3