From bc6c904a8ba143477cfe2c8f281c143b7e27aea5 Mon Sep 17 00:00:00 2001
From: naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Thu, 19 Aug 2010 10:14:17 +0000
Subject: [PATCH] * tool/merger.rb: Add a tool to merge commits between
 branches.   developed by URABE Shyouhei

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

diff --git a/ChangeLog b/ChangeLog
index 747ebf7437..ce831222cd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Aug 19 18:15:50 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* tool/merger.rb: Add a tool to merge commits between branches.
+	  developed by URABE Shyouhei
+
 Thu Aug 19 17:19:09 2010  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
 
 	* backport r28621 and r28632 from ruby_1_8;