From 5288a7dc9a1009f6063ac5b4da55090225176ded Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Wed, 26 Nov 2014 15:19:08 +0000
Subject: [PATCH] Bump version and changelog

---
 CHANGES.rst         | 5 +++++
 VERSION             | 2 +-
 synapse/__init__.py | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index 3cd08938a..5f1fa3a9d 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,8 @@
+Changes in synapse 0.5.2 (2014-11-26)
+=====================================
+
+Fix major bug that caused rooms to disspear from peoples initial sync.
+
 Changes in synapse 0.5.1 (2014-11-26)
 =====================================
 See UPGRADES.rst for specific instructions on how to upgrade.
diff --git a/VERSION b/VERSION
index 4b9fcbec1..cb0c939a9 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.5.1
+0.5.2
diff --git a/synapse/__init__.py b/synapse/__init__.py
index 1c10c2074..d5c2f2548 100644
--- a/synapse/__init__.py
+++ b/synapse/__init__.py
@@ -16,4 +16,4 @@
 """ This is a reference implementation of a synapse home server.
 """
 
-__version__ = "0.5.1"
+__version__ = "0.5.2"