From 63774d0757ea5a8ed8b18dbdd6a139ad60b1891e Mon Sep 17 00:00:00 2001
From: Thomas Waldmann <tw@waldmann-edv.de>
Date: Thu, 17 Jul 2014 15:13:41 +0200
Subject: [PATCH] require django 1.6.x, fixes #141

---
 CHANGES.rst | 5 ++---
 setup.py    | 5 +++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index 5c7cff5..7da5359 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -8,9 +8,7 @@ Important notes:
 
 * WE_HAVE_SSL configuration setting name was changed to WE_HAVE_TLS.
   Please update your configuration, if you use it.
-* using django 1.6.x is strongly recommended, 1.5 might need fixing
-  nsupdate/login/urls.py (see comment there).
-  https://github.com/nsupdate-info/nsupdate.info/issues/141
+* Django 1.6.x required now, if you want to use 1.5.x: see setup.py
 
 New Features:
 
@@ -54,6 +52,7 @@ Other changes:
 * replaced "SSL" by "TLS" everywhere.      
   SSL is the old/outdated name. Since 1999, it's called TLS.
 
+
 Release 0.6.0
 -------------
 
diff --git a/setup.py b/setup.py
index 712fa06..f0f5ce7 100644
--- a/setup.py
+++ b/setup.py
@@ -50,8 +50,9 @@ setup(
     zip_safe=False,
     platforms='any',
     install_requires=install_requires + [
-        'django >=1.5.3, <1.7',  # 1.5.3 has the session serializer configurable
-                                 # 1.7 is not tested yet
+        'django >=1.6, <1.7',  # 1.7 is not tested yet
+        # django >= 1.5.3 also works, but needs a code change, see
+        # https://github.com/nsupdate-info/nsupdate.info/issues/141
         'south',
         'django-bootstrap-form',
         'django-registration',