Subject: Fix Django 1.6 incompatbility for Sphinx documentation generation
Author: Jan Dittberner <jan@dittberner.info>
Date:   Mon Nov 25 18:20:28 2013 +0100
Forwarded: https://github.com/maraujop/django-crispy-forms/pull/273
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -22,9 +22,8 @@ sys.path.insert(0, os.path.abspath('../crispy_forms'))
 sys.path.insert(0, os.path.abspath('../crispy_forms/templatetags'))
 sys.path.append(os.path.abspath('_themes'))
 
-import settings
-from django.core.management import setup_environ
-setup_environ(settings)
+from django.conf import settings
+settings.configure()
 
 
 # -- General configuration -----------------------------------------------------
