From 99285bcd5715eac7d99e49eda97dbb3a0643201a Mon Sep 17 00:00:00 2001
From: xibbar <xibbar@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Wed, 17 Jul 2013 03:02:40 +0000
Subject: ChangeLog: Update r42013 r42014.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@42018 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'ChangeLog')

diff --git a/ChangeLog b/ChangeLog
index 4ceb79d96e..65d7e41d80 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+Wed Jul 17 11:57:45 2013  Takeyuki FUJIOKA  <xibbar@ruby-lang.org>
+
+	* lib/cgi/util.rb (CGI::Util#escape, unescape): Avoid use of regexp
+	  special global variable. [Feature #8648] Thanks to fotos.
+
+Wed Jul 17 11:57:10 2013  Takeyuki FUJIOKA  <xibbar@ruby-lang.org>
+
+	* lib/erb.rb (ERB::Util#url_encode): Avoid use of regexp special global
+	  variable. [Feature #8648] Thanks to fotos.
+
 Wed Jul 17 08:12:41 2013  Tanaka Akira  <akr@fsij.org>
 
 	* st.c (st_locale_insensitive_strcasecmp): Renamed from st_strcasecmp.
-- 
cgit v1.2.3