From d2709a538956edf12f5f086f08b0c15198f3fd1e Mon Sep 17 00:00:00 2001
From: Mark Haines <mjark@negativecurvature.net>
Date: Mon, 4 Jan 2016 13:57:39 +0000
Subject: [PATCH] Bump changelog and version for v0.12.0

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

diff --git a/CHANGES.rst b/CHANGES.rst
index 97b7a7e1a0..1d43fd3604 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,6 +1,7 @@
-Changes in synapse v0.12.0-rc4 (unreleased)
-===========================================
-* Fix C-S API to expose ``/login`` under ``r0`` (PR #459)
+Changes in synapse v0.12.0 (2016-01-04)
+=======================================
+
+* Expose ``/login`` under ``r0`` (PR #459)
 
 Changes in synapse v0.12.0-rc3 (2015-12-23)
 ===========================================
diff --git a/synapse/__init__.py b/synapse/__init__.py
index d1ce6b982d..5db4eae354 100644
--- a/synapse/__init__.py
+++ b/synapse/__init__.py
@@ -16,4 +16,4 @@
 """ This is a reference implementation of a Matrix home server.
 """
 
-__version__ = "0.12.0-rc3"
+__version__ = "0.12.0"