1 files changed, 8 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index aa9a2aaab8..8cdb502d4c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Fri Dec 18 16:54:38 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/stringio/stringio.c (strio_set_encoding): add StringIO's own
+	  encoding and separate it from the buffer string to override the
+	  encoding of string when reading.  [ruby-core:72189] [Bug #11827]
+	  note that setting the encoding of its buffer string may cause
+	  unpredictable behavior.
+
 Fri Dec 18 16:50:35 2015  Koichi Sasada  <ko1@atdot.net>
 
 	* compile.c (ibf_load_setup): check tainted string argument.