Merge branch 'release/1.1.0' into develop

maintainer.txt

@@ -4,7 +4,7 @@ ensure unit tests pass
 git flow release start X.Y.Z
 git flow release start X.Y.Z
 bump __version__ in sshkey/__init__.py
 bump __version__ in sshkey/__init__.py
 git add sshkey/__init__.py
 git add sshkey/__init__.py
-git ci -m 'bump version'
+git commit -m 'bump version'
 python setup.py sdist
 python setup.py sdist
 git flow release finish X.Y.Z
 git flow release finish X.Y.Z
 git push origin master X.Y.Z
 git push origin master X.Y.Z

sshkey/__init__.py

@@ -15,4 +15,4 @@
 # You should have received a copy of the GNU Lesser General Public License
 # You should have received a copy of the GNU Lesser General Public License
 # along with django-sshkey.  If not, see <http://www.gnu.org/licenses/>.
 # along with django-sshkey.  If not, see <http://www.gnu.org/licenses/>.
 
 
-__version__ = '1.0.1'
+__version__ = '1.1.0'