From 36860a2f6c125f277d4fdb5a8541b04e0e9973d3 Mon Sep 17 00:00:00 2001
From: yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sun, 4 Jan 2009 11:53:33 +0000
Subject: merges r20850, r17881, r16811, r16763, r16748, r15829, r15794 and
 r15698 from ruby_1_8 into ruby_1_9_1..

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

(limited to 'ChangeLog')

diff --git a/ChangeLog b/ChangeLog
index 924bf025d..d9aba03fb 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