From 132e2cfdf98521460a7c22dfc1edc4d7c658ce9a Mon Sep 17 00:00:00 2001
From: Diederik van der Boor <vdboor@edoburu.nl>
Date: Fri, 3 Feb 2017 22:08:48 +0100
Subject: [PATCH] Bump to v1.1

---
 docs/changelog.rst      | 6 ++++--
 docs/conf.py            | 2 +-
 polymorphic/__init__.py | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 421343f..1593c2c 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -1,12 +1,14 @@
 Changelog
 =========
 
-Version 1.1 (1.1b2)
--------------------
+Version 1.1 (2017-01-27)
+------------------------
 
 * Added class based formset views in ``polymorphic/contrib/extra_views``.
 * Added helper function ``polymorphic.utils.reset_polymorphic_ctype()``.
   This eases the migration old existing models to polymorphic.
+* Fixed Python 2.6 issue.
+* Fixed Django 1.6 support.
 
 
 Version 1.0.2 (2016-10-14)
diff --git a/docs/conf.py b/docs/conf.py
index 9e76964..8ae26d3 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -64,7 +64,7 @@ copyright = u'2013, Bert Constantin, Chris Glass, Diederik van der Boor'
 # The short X.Y version.
 version = '1.1'
 # The full version, including alpha/beta/rc tags.
-release = '1.1b2'
+release = '1.1'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/polymorphic/__init__.py b/polymorphic/__init__.py
index b875479..1a2fdc0 100644
--- a/polymorphic/__init__.py
+++ b/polymorphic/__init__.py
@@ -9,7 +9,7 @@ Please see LICENSE and AUTHORS for more information.
 import django
 
 # See PEP 440 (https://www.python.org/dev/peps/pep-0440/)
-__version__ = "1.1b2"
+__version__ = "1.1"
 
 
 # Monkey-patch Django < 1.5 to allow ContentTypes for proxy models.