From: Rob Golding <rob@robgolding.com>
Date: Sat, 13 Feb 2016 23:20:07 +0000 (+0000)
Subject: Merge branch 'release/0.12.1' into develop
X-Git-Url: https://git.madduck.net/etc/taskwarrior.git/commitdiff_plain/791af4dbe80d6c760589edf5aa9f2895558a83d2?hp=7d0294524dc4edf78a43d3e0c439dc317ebdc055

Merge branch 'release/0.12.1' into develop
---

diff --git a/docs/conf.py b/docs/conf.py
index 9b679e0..d1a1ce1 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -51,9 +51,9 @@ copyright = u'2014, Rob Golding'
 # built documents.
 #
 # The short X.Y version.
-version = '0.12.0'
+version = '0.12.1'
 # The full version, including alpha/beta/rc tags.
-release = '0.12.0'
+release = '0.12.1'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/setup.py b/setup.py
index eea0197..b7ebe9c 100644
--- a/setup.py
+++ b/setup.py
@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 install_requirements = ['six==1.5.2', 'pytz', 'tzlocal']
 
-version = '0.12.0'
+version = '0.12.1'
 
 try:
     import importlib