From c9e232a79bee9179153fed696f35127cbf1f7874 Mon Sep 17 00:00:00 2001
From: Diederik van der Boor <vdboor@edoburu.nl>
Date: Tue, 14 Oct 2014 16:29:30 +0200
Subject: [PATCH] Bump version to 0.6

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

diff --git a/docs/changelog.rst b/docs/changelog.rst
index dd8a877..dee584e 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -1,11 +1,11 @@
 Changelog
 ==========
 
-Version 0.6 (in git)
---------------------
+Version 0.6 (2014-10-14)
+------------------------
 
-* Added permission check for all child types.
 * Added Django 1.7 support.
+* Added permission check for all child types.
 * **BACKWARDS INCOMPATIBILITY:** the ``get_child_type_choices()`` method receives 2 arguments now (request, action).
   If you have overwritten this method in your code, make sure the method signature is updated accordingly.
 
diff --git a/docs/conf.py b/docs/conf.py
index e2d462f..542a62e 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -54,9 +54,9 @@ copyright = u'2013, Bert Constantin, Chris Glass, Diederik van der Boor'
 # built documents.
 #
 # The short X.Y version.
-version = '0.5.6'
+version = '0.6'
 # The full version, including alpha/beta/rc tags.
-release = '0.5.6'
+release = '0.6'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/polymorphic/__version__.py b/polymorphic/__version__.py
index 068f70f..0547850 100644
--- a/polymorphic/__version__.py
+++ b/polymorphic/__version__.py
@@ -11,4 +11,4 @@ Release logic:
     6. git commit
     7. push to github
 """
-__version__ = "0.5.6"
+__version__ = "0.6"