From: Rob Golding <rob@robgolding.com>
Date: Wed, 22 Jul 2015 12:02:14 +0000 (+0100)
Subject: Merge branch 'release/0.10.0' into develop
X-Git-Url: https://git.madduck.net/etc/taskwarrior.git/commitdiff_plain/1c7620f16af735f074cc9903e15e38260f1faf4e?hp=4caffb3dcb48c05980ea41fd0a019ff33505aae5

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

diff --git a/docs/conf.py b/docs/conf.py
index 73ffc76..8bb5ad5 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.9.0'
+version = '0.10.0'
 # The full version, including alpha/beta/rc tags.
-release = '0.9.0'
+release = '0.10.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 d62e437..a275915 100644
--- a/setup.py
+++ b/setup.py
@@ -1,6 +1,6 @@
 from setuptools import setup, find_packages
 
-version = '0.9.0'
+version = '0.10.0'
 
 setup(
     name='tasklib',