From 8a42e6432f2e13f1f6dbd4b33689d6ba16936b67 Mon Sep 17 00:00:00 2001
From: yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 30 Dec 2008 10:32:16 +0000
Subject: merges r21171 from trunk into ruby_1_9_1. * bin/erb: accepts options
 in more flexible styles.

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

(limited to 'ChangeLog')

diff --git a/ChangeLog b/ChangeLog
index ddb60d91d..dedcb87a1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Mon Dec 29 17:53:24 2008  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* bin/erb: accepts options in more flexible styles.
+
 Mon Dec 29 17:25:17 2008  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
 
 	* lib/erb.rb (ERB): m17n of ERB. adds rdoc.
-- 
cgit