From 35d36573c359d2f3ac8a28e41e8945e4289f7c2f Mon Sep 17 00:00:00 2001
From: yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sat, 5 Dec 2009 09:39:18 +0000
Subject: merges r25402 from trunk into ruby_1_9_1. fixes the backport task
 #1921. -- * parse.y (parser_here_document): dispatch delayed heredoc  
 contents.  based on a patch from Andy Keep in [ruby-core:24855].

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

(limited to 'ChangeLog')

diff --git a/ChangeLog b/ChangeLog
index e9837eea6f..bcf2417dbd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Oct 20 14:50:51 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (parser_here_document): dispatch delayed heredoc
+	  contents.  based on a patch from Andy Keep in [ruby-core:24855].
+
 Fri Jan 30 18:04:23 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* win32/win32.c (rb_w32_write): limit write size to 32KB if the file
-- 
cgit v1.2.3