Merge branch 'master' into develop

3 files changed, 6 insertions, 6 deletions

diff --git a/CHANGES.md b/CHANGES.md

index 22684420a4..b25775d18e 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,5 +1,5 @@
-Synapse 0.99.2rc1 (2019-02-27)
-==============================
+Synapse 0.99.2 (2019-03-01)
+===========================
 
 Features
 --------
diff --git a/debian/changelog b/debian/changelog

index 8a59c708d7..fd77ce13a2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-matrix-synapse-py3 (0.99.2rc1) stable; urgency=medium
+matrix-synapse-py3 (0.99.2) stable; urgency=medium
 
   * Fix overwriting of config settings on upgrade.
-  * New synapse release 0.99.2rc1.
+  * New synapse release 0.99.2.
 
- -- Synapse Packaging team <packages@matrix.org>  Wed, 27 Feb 2019 10:45:58 +0000
+ -- Synapse Packaging team <packages@matrix.org>  Fri, 01 Mar 2019 10:55:08 +0000
 
 matrix-synapse-py3 (0.99.1.1) stable; urgency=medium
 
diff --git a/synapse/__init__.py b/synapse/__init__.py

index 29b1fe4c03..25c10244d3 100644
--- a/synapse/__init__.py
+++ b/synapse/__init__.py
@@ -27,4 +27,4 @@ try:
 except ImportError:
     pass
 
-__version__ = "0.99.2rc1"
+__version__ = "0.99.2"