1 files changed, 5 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 4f19050a46..ba781632de 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Nov  3 07:47:25 2010  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/irb/ruby-lex.rb (RubyLex#identify_string): parse multiple
+	  regex options.  a patch from Heesob Park in [ruby-core:32988].
+
 Wed Nov  3 07:33:57 2010  Tanaka Akira  <akr@fsij.org>
 
 	* vm_method.c (rb_clear_cache_by_class): just return if the class has