From ed7b68a23c90f3b1c85b06a479c37efbdc5eeb98 Mon Sep 17 00:00:00 2001
From: usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Mon, 26 Aug 2019 13:49:50 +0000
Subject: merge revision(s) af1e487e9bb763b939dc6704c9a343c9eafa1637: [Backport
 #15801]

	Updated marked commits for ChangeLog


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_5@67751 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 doc/ChangeLog-2016 | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'doc')

diff --git a/doc/ChangeLog-2016 b/doc/ChangeLog-2016
index c708428a93..14fcba55ab 100644
--- a/doc/ChangeLog-2016
+++ b/doc/ChangeLog-2016
@@ -1,5 +1,6 @@
 ------------------------------------------------------------------------
-r56645 | naruse | 2016-11-07 00:56:27 +0900 (Mon, 07 Nov 2016) | 1 line
+r57181 | matz | 2016-12-26 01:35:51 +0900 (Mon, 26 Dec 2016) | 2 lines
+
+version.h (RUBY_VERSION): 2.5.0 development has started.
 
-Obsolete ChangeLog [Feature #12283]
 ------------------------------------------------------------------------
-- 
cgit v1.2.3