From 89fc09c3d11b3574919a311dbf68816116873abb Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Wed, 7 Jan 2015 13:56:56 +0000
Subject: [PATCH] Bump version and changelog

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

diff --git a/CHANGES.rst b/CHANGES.rst
index 813ad364e..3bd69367b 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,11 @@
+Changes in synapse 0.6.1 (2015-01-07)
+=====================================
+
+ * Various optimization to improve performance of event sending and initial
+   sync.
+ * Media repository now includes a Content-Length header on media downloads.
+ * Improve quality of thumbnails by changing resizing algorithm.
+
 Changes in synapse 0.6.0 (2014-12-16)
 =====================================
 
diff --git a/VERSION b/VERSION
index a918a2aa1..ee6cdce3c 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.6.0
+0.6.1
diff --git a/synapse/__init__.py b/synapse/__init__.py
index 06167e3c1..c3f1ac63b 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.6.0"
+__version__ = "0.6.1"