1 files changed, 4 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 61d17b0ead..e22615fd05 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Wed May 16 14:30:43 2012  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* io.c: fixed a merge mistake of r33878, reported by nobu via IRC.
+
 Wed May 16 06:59:41 2012  Tadayoshi Funaba  <tadf@dotrb.org>
 
 	* ext/date/date_strftime.c: should also be aware of flags on