From: Rob Golding <rob@robgolding.com>
Date: Sun, 31 Jan 2016 18:29:47 +0000 (+0000)
Subject: Merge branch 'release/0.12.0' into develop
X-Git-Url: https://git.madduck.net/etc/taskwarrior.git/commitdiff_plain/f653e7f77ba70761ffcb285268a8a89b4a76eb0b?hp=a2447bf8728f9cd3441628e7f59cbd8828989cba

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

diff --git a/docs/conf.py b/docs/conf.py
index 3333347..9b679e0 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.11.0'
+version = '0.12.0'
 # The full version, including alpha/beta/rc tags.
-release = '0.11.0'
+release = '0.12.0'
 
 # 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 ddca694..eea0197 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.11.0'
+version = '0.12.0'
 
 try:
     import importlib