1 files changed, 5 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 856d390c8b..cfdd9f643e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Jun  4 11:40:28 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* marshal.c (r_object0): also load TYPE_USRMARSHAL, TYPE_DATA using
+	  compatible loader.
+
 Mon Jun  4 11:33:42 2012  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* process.c (rb_run_exec_options_err): restore save_env() call for