Merge branch 'master' of github.com:ask/celery

docs/cookbook/daemonizing.rst

@@ -128,7 +128,7 @@ environment's python interpreter::
     CELERYD_MULTI="$ENV_PYTHON $CELERYD_CHDIR/manage.py celeryd_multi"
 
     # How to call "manage.py celeryctl"
-    CELERYCTL=$ENV_PYTHON $CELERYD_CHDIR/manage.py celeryctl"
+    CELERYCTL="$ENV_PYTHON $CELERYD_CHDIR/manage.py celeryctl"
     
     # Extra arguments to celeryd
     CELERYD_OPTS="--time-limit=300 --concurrency=8"

requirements/py25.txt

@@ -1,3 +1,4 @@
 multiprocessing==2.6.2.1
 importlib
 ordereddict
+simplejson