1 files changed, 7 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 63af9c9a69..28bcb8db17 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Wed Sep  2 16:58:21 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* file.c (rb_realpath_internal): use filesystem encoding if the
+	  argument is in ASCII encodings.
+
+	* win32/file.c (rb_readlink): needs the result encoding.
+
 Tue Sep  1 18:37:15 2015  Koichi Sasada  <ko1@atdot.net>
 
 	* test/thread/test_queue.rb: catch up last commit.