From 5583870caa593e1867ce71f99bd05d5ac97ed413 Mon Sep 17 00:00:00 2001
From: Jan Dittberner <jan@dittberner.info>
Date: Sat, 24 Jan 2015 16:33:32 +0100
Subject: [PATCH] define version number, mark version in changelog

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

diff --git a/docs/changelog.rst b/docs/changelog.rst
index d457f95..d95fc2b 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -1,6 +1,7 @@
 Changelog
 =========
 
+* :release:`0.6.0 <2015-01-24>`
 * :feature:`-` add frontend functionality to set an os users' sftp password
   (needs gvaldap >= 0.4.0 on the LDAP side)
 * :support:`-` remove unused dashboard.views.LogoutView and the corresponding
diff --git a/docs/conf.py b/docs/conf.py
index d90a30a..fe3b775 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -60,9 +60,9 @@ copyright = u'2014, 2015 Jan Dittberner'
 # built documents.
 #
 # The short X.Y version.
-version = '0.5'
+version = '0.6'
 # The full version, including alpha/beta/rc tags.
-release = '0.5.2'
+release = '0.6.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.