1 files changed, 5 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 939427a134..d9a915dad7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Feb 24 08:52:09 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (parser_tokadd_string, parser_yylex): insert a backslash
+	  if the next character is non-ascii.  [ruby-dev:45278] [Bug #6069]
+
 Fri Feb 24 08:13:20 2012  Eric Hodel  <drbrain@segment7.net>
 
 	* lib/profiler.rb:  Add Profiler documentation by Gonzalo Rodriguez.