From 96badf462c867209d9e0eb32bb3806faf4acd10f Mon Sep 17 00:00:00 2001
From: mike wakerly <opensource@hoho.com>
Date: Mon, 1 Dec 2014 01:39:54 -0500
Subject: [PATCH] v1.2.0

---
 docs/source/changelog.rst | 4 ++--
 setup.py                  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/source/changelog.rst b/docs/source/changelog.rst
index 7bc043e2b..38f4e9423 100644
--- a/docs/source/changelog.rst
+++ b/docs/source/changelog.rst
@@ -5,8 +5,8 @@ Changelog
 
 **Upgrade Procedure:** Please follow :ref:`upgrading-kegbot` for general upgrade steps.
 
-Current Version (in development)
---------------------------------
+Version 1.2.0 (2014-12-01)
+--------------------------
 * Keg management improvements: The new "Keg Room" view shows kegs by status,
   and allows kegs to be manually moved between "available" and "finished"
   states.
diff --git a/setup.py b/setup.py
index a0fa005b6..e115733c2 100755
--- a/setup.py
+++ b/setup.py
@@ -8,7 +8,7 @@
 
 from setuptools import setup, find_packages
 
-VERSION = '1.2.0a5'
+VERSION = '1.2.0'
 DOCLINES = __doc__.split('\n')
 
 SHORT_DESCRIPTION = DOCLINES[0]