From 23eaf8f818c106f05687ad6ebbf15558681184fc Mon Sep 17 00:00:00 2001
From: mike wakerly <opensource@hoho.com>
Date: Sat, 3 Jan 2015 14:10:51 -0500
Subject: [PATCH] v1.2.2

---
 docs/source/changelog.rst | 8 ++++++++
 setup.py                  | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/docs/source/changelog.rst b/docs/source/changelog.rst
index 118e2ae0a..dfb1b2997 100644
--- a/docs/source/changelog.rst
+++ b/docs/source/changelog.rst
@@ -5,10 +5,18 @@ Changelog
 
 **Upgrade Procedure:** Please follow :ref:`upgrading-kegbot` for general upgrade steps.
 
+Version 1.2.2 (2015-01-03)
+--------------------------
+* New command `kegbot bugreport` collects various system information.
+* Bugfix: Crash on end keg button (#326).
+* Bugfix: Unicode error during `kegbot upgrade` (#328).
+
+
 Version 1.2.1 (2014-12-02)
 --------------------------
 * Fixed `run_gunicorn` launcher.
 
+
 Version 1.2.0 (2014-12-01)
 --------------------------
 * Keg management improvements: The new "Keg Room" view shows kegs by status,
diff --git a/setup.py b/setup.py
index b52a4e11c..f1a0352eb 100755
--- a/setup.py
+++ b/setup.py
@@ -8,7 +8,7 @@
 
 from setuptools import setup, find_packages
 
-VERSION = '1.2.1'
+VERSION = '1.2.2'
 DOCLINES = __doc__.split('\n')
 
 SHORT_DESCRIPTION = DOCLINES[0]