1 files changed, 4 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 984e26779b..47be16a894 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Mon Sep  5 10:04:35 2011  Ayumu AIZAWA  <[email protected]>
+
+	* README.ja, README.EXT.ja: resolve conflicts. [ruby-dev:44459]
+
 Mon Sep  5 05:13:22 2011  Marc-Andre Lafortune  <[email protected]>
 
 	* numeric.c (flo_round): Make Float#round round big values [bug