From bf6dd5c2f761e9d9edbcba370f6d0503006cbc76 Mon Sep 17 00:00:00 2001
From: duerst <duerst@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 15 Dec 2015 10:03:11 +0000
Subject: fixing ChangeLog problem

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

(limited to 'ChangeLog')

diff --git a/ChangeLog b/ChangeLog
index d6b28070d9..a351615553 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,18 @@ Tue Dec 15 17:57:57 2015  Martin Duerst  <duerst@it.aoyama.ac.jp>
 	  to the correct one in the IANA registry (IBM037)
 	  and added an alias (ebcdic-cp-us)
 
+Tue Dec 15 16:19:26 2015  Takashi Kokubun  <takashikkbn@gmail.com>
+
+	* lib/erb.rb: Render erb with array buffer for function call optimization.
+	  [fix GH-1143]
+	* lib/rdoc/erb_partial.rb: ditto.
+	* template/verconf.h.tmpl: ditto.
+
+Tue Dec 15 13:50:05 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (rb_str_oct): [DOC] mention radix indicators.
+	  [ruby-core:71310] [Bug #11648]
+
 Tue Dec 15 12:20:30 2015  Takashi Kokubun  <takashikkbn@gmail.com>
 
 	* lib/erb.rb: Simplify regexp to optimize erb scanner.
-- 
cgit v1.2.3