From: Rob Golding <rob@robgolding.com>
Date: Thu, 15 Jan 2015 11:46:20 +0000 (+0000)
Subject: Merge branch 'release/0.7.1' into develop
X-Git-Url: https://git.madduck.net/etc/taskwarrior.git/commitdiff_plain/6855958d83f2a0b2580e68744df7cc5f9a967391?hp=7ebc4edb8e4a986886bf624690f00d28517ee5b8

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

diff --git a/docs/conf.py b/docs/conf.py
index 1b455c6..e83a5e3 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.7.1-dev'
+version = '0.7.1'
 # The full version, including alpha/beta/rc tags.
-release = '0.7.1-dev'
+release = '0.7.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 48b3d55..64018ea 100644
--- a/setup.py
+++ b/setup.py
@@ -1,6 +1,6 @@
 from setuptools import setup, find_packages
 
-version = '0.7.1-dev'
+version = '0.7.1'
 
 setup(
     name='tasklib',