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

extra/supervisord/supervisord.conf

@@ -26,9 +26,3 @@ serverurl=unix:///tmp/supervisor.sock ; use unix:// schem for a unix sockets.
 # Uncomment this line for celeryd for Python
 ;files=celeryd.conf
 
-# Uncomment this line for celeryd for Django.
-;files=django/celeryd.conf
-
-
-
-