Merge branch '3.1' of github.com:celery/celery into 3.1

examples/django/proj/celery.py

@@ -4,11 +4,11 @@ import os
 
 from celery import Celery
 
-from django.conf import settings
-
 # set the default Django settings module for the 'celery' program.
 os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'proj.settings')
 
+from django.conf import settings
+
 app = Celery('proj')
 
 # Using a string here means the worker will not have to