From ff77748cbbffad4a07a1b740dd23047430705bda Mon Sep 17 00:00:00 2001
From: seki <seki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sat, 3 Jan 2009 15:36:14 +0000
Subject: merged r20850, r17881, r16811, r16763, r16748, r15829, r15794 and
 r15698 from ruby_1_8.

git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@21286 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'ChangeLog')

diff --git a/ChangeLog b/ChangeLog
index 92e76bc8e..df0bc85a6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Sun Jan  4 00:30:50 2009  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+
+	* lib/erb.rb: merged r20850, r17881, r16811, r16763, r16748, r15829, 
+	  r15794 and r15698 from ruby_1_8.
+
+	* test/erb/test_erb.rb: ditto.
+
 Sat Jan  3 22:24:36 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* common.mk, Makefile.in, win32/Makefile.sub (INSNS): move the macro
-- 
cgit