From 176e3fd141ba9485ead8658e90ba000cef8db02c Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Mon, 22 Sep 2014 17:42:09 +0100
Subject: [PATCH] Bump versions and changelog

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

diff --git a/CHANGES.rst b/CHANGES.rst
index dd188cf86..400ded0f1 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,23 @@
+Changes in synapse 0.3.3 (2014-09-22)
+=====================================
+
+Homeserver:
+ * Fix bug where you continued to get events for rooms you had left.
+
+Webclient:
+ * Add support for video calls with basic UI.
+ * Fix bug where one to one chats were named after your display name rather
+   than the other person's.
+ * Fix bug which caused lag when typing in the textarea.
+ * Refuse to run on browsers we know won't work.
+ * Trigger pagination when joining new rooms.
+ * Fix bug where we sometimes didn't display invitations in recents.
+ * Automatically join room when accepting a VoIP call.
+ * Disable outgoing and reject incoming calls on browsers we don't support
+   VoIP in.
+ * Don't display desktop notifications for messages in the room you are
+   non-idle and speaking in.
+
 Changes in synapse 0.3.2 (2014-09-18)
 =====================================
 
diff --git a/VERSION b/VERSION
index d15723fbe..1c09c74e2 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.3.2
+0.3.3
diff --git a/synapse/__init__.py b/synapse/__init__.py
index 0dbad9a0d..bba551b2c 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.3.2"
+__version__ = "0.3.3"