1 files changed, 5 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 5264327830..e50863addf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Dec 15 12:20:30 2015  Takashi Kokubun  <takashikkbn@gmail.com>
+
+	* lib/erb.rb: Simplify regexp to optimize erb scanner.
+	  [fix GH-1144]
+
 Tue Dec 15 11:56:24 2015  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
 
 	* lib/uri/common.rb: make code block for rdoc.