1 files changed, 5 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 2a15949f61..c7f16d7093 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Aug 13 13:13:19 2012  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* lib/erb.rb (ERB::Util.html_escape): use CGI.escape to escape
+	  single quotes. [ruby-core:47138] [Bug #6861]
+
 Sun Aug 12 11:57:20 2012  Kazuki Tsujimoto  <kazuki@callcc.net>
 
 	* vm.c (invoke_block_from_c): fix unintentional block passing.