merges r25318 from trunk into ruby_1_9_1.

--
* parse.y (parser_magic_comment): fixed normalization.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@26483 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 4 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index e693a3c57b..6656ce2d0e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Tue Oct 13 18:20:57 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (parser_magic_comment): fixed normalization.
+
 Mon Oct 12 23:27:57 2009  Shugo Maeda  <shugo@ruby-lang.org>
 
 	* lib/net/ftp.rb (login): use "anonymous@" as a default password.