1 files changed, 7 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 1d18201e47..838ff1ae22 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -14,6 +14,13 @@ Tue Aug 23 15:11:48 2011  Hiroshi Nakamura  <nahi@ruby-lang.org>
 
 	* test/zlib/test_zlib.rb (test_corrupted_header): Test it.
 
+Mon Aug 22 23:43:33 2011  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
+
+	* backport r33021 from trunk.
+
+	* sprintf.c (rb_str_format): add RB_GC_GUARD to prevent temporary
+	  strings from GC.
+
 Sun Aug 21 17:58:38 2011  Kazuki Tsujimoto  <kazuki@callcc.net>
 
 	* backport r33019 from trunk.