1 files changed, 6 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index f7ed85a445..f277500497 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Tue Mar  1 15:59:53 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* string.c (rb_str_byteslice): the resulted encoding should keep
+	  original encoding. this also fixes the encoding when the result
+	  shares internal string. [ruby-core:35376]
+
 Tue Mar  1 13:25:00 2011  Kenta Murata <mrkn@mrkn.jp>
 
 	* ext/bigdecimal/bigdecimal.c (VpMemAlloc): CVE-2011-0188.