Merge branch 'release/1.1.1' into develop

GothenburgBitFactory · Feb 17, 2015 · 2a1cec7 · 2a1cec7
2 parents d50486e + bd4d96a
commit 2a1cec7
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -1,6 +1,12 @@
 Changelog
 =========
 
+1.1.1
+-----
+
+- Fixes a couple minor typos in service classpaths listed in DeferredImportingDict. `7844a0beb <https://github.com/ralphbean/bugwarrior/commit/7844a0beb0bce92009338327fe3a7c8cc4c78196>`_
+- Merge pull request #206 from coddingtonbear/fix_service_classpath `d50486ee6 <https://github.com/ralphbean/bugwarrior/commit/d50486ee6cb7cf2abc68a92bf0fc5247fb58ee51>`_
+
 1.1.0
 -----
 

diff --git a/setup.py b/setup.py
@@ -1,6 +1,6 @@
 from setuptools import setup, find_packages
 
-version = '1.1.0'
+version = '1.1.1'
 
 f = open('bugwarrior/README.rst')
 long_description = f.read().strip()