commit 54a1bd9624d81217d40160ddb699f05a16d87358
author Alexander Thomas <athom@google.com> Fri Sep 06 20:39:27 2019 +0200
committer Alexander Thomas <athom@google.com> Fri Sep 06 20:39:27 2019 +0200
tree 61b1bc02b3d28cbf4acd8d24ae41b9672da86987
parent 04b7b090eb5dd714654faa80843c1feadc1ccede
parent 1ef83b86ae637ffe7359173804cbc6d3fa25e6db

Version 2.5.0

Merge commit '1ef83b86ae637ffe7359173804cbc6d3fa25e6db' into stable

CHANGELOG.md

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c048c13..dff27ac 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,4 @@
-## Next release
-(Add new changes here, and they will be copied to the change section for the
- next release)
+## 2.5.0 - 2019-09-10
 
 ### Language
 

tools/VERSION

diff --git a/tools/VERSION b/tools/VERSION
index 657c504..546548f 100644
--- a/tools/VERSION
+++ b/tools/VERSION
@@ -29,7 +29,7 @@
 #  * Deprecating an old ABI version:
 #     - increase OLDEST_SUPPORTED_ABI_VERSION to the version that is supported.
 #
-CHANNEL be
+CHANNEL stable
 MAJOR 2
 MINOR 5
 PATCH 0