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

2 files changed, 6 insertions, 5 deletions

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]
 ------------------------------------------------------------------------
diff --git a/version.h b/version.h
index f1d0efdfa0..d3c912dc34 100644
--- a/version.h
+++ b/version.h
@@ -1,10 +1,10 @@
 #define RUBY_VERSION "2.5.6"
-#define RUBY_RELEASE_DATE "2019-08-19"
-#define RUBY_PATCHLEVEL 170
+#define RUBY_RELEASE_DATE "2019-08-26"
+#define RUBY_PATCHLEVEL 171
 
 #define RUBY_RELEASE_YEAR 2019
 #define RUBY_RELEASE_MONTH 8
-#define RUBY_RELEASE_DAY 19
+#define RUBY_RELEASE_DAY 26
 
 #include "ruby/version.h"