From 463b95f0c21b9ab52af5fdd5572ccf1d981591de Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Fri, 29 Aug 2014 15:36:53 +0100
Subject: [PATCH] Bump version and change log

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

diff --git a/CHANGES.rst b/CHANGES.rst
index fc6385cb1..334602fdf 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,25 @@
+Changes in synapse 0.1.0 (2014-08-29)
+=====================================
+Presence has been reenabled in this release.
+
+Homeserver:
+ * Update client to server API, including:
+    - Use a more consistent url scheme.
+    - Provide more useful information in the initial sync api.
+ * Change the presence handling to be much more efficient.
+ * Change the presence server to server API to not require explicit polling of
+   all users who share a room with a user.
+ * Fix races in the event streaming logic.
+
+Webclient:
+ * Update to use new client to server API.
+ * Add basic VOIP support.
+ * Add idle timers that change your status to away.
+ * Add recent rooms column when viewing a room.
+ * Various network efficiency improvements.
+ * Add basic mobile browser support.
+ * Add a settings page.
+
 Changes in synapse 0.0.1 (2014-08-22)
 =====================================
 Presence has been disabled in this release due to a bug that caused the
diff --git a/VERSION b/VERSION
index 8acdd82b7..6e8bf73aa 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.0.1
+0.1.0
diff --git a/synapse/__init__.py b/synapse/__init__.py
index 47fc1b2ea..a32208517 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.0.1"
+__version__ = "0.1.0"