Merge branch 'master' into orm

# Conflicts:
#	docs/conf.py

django_q/__init__.py

@@ -9,6 +9,6 @@ from .models import Task, Schedule, Success, Failure
 from .cluster import Cluster
 from .status import Stat
 
-VERSION = (0, 6, 3)
+VERSION = (0, 6, 4)
 
 default_app_config = 'django_q.apps.DjangoQConfig'

docs/configure.rst

@@ -28,11 +28,12 @@ All configuration settings are optional:
 name
 ~~~~
 
-Used to differentiate between projects using the same Redis server. Defaults to ``'default'``.
-This can be useful if you have several projects using the same Redis server.
+Used to differentiate between projects using the same broker.
+On most broker types this will be used as the queue name.
+Defaults to ``'default'``.
 
 .. note::
-    Tasks are encrypted. When a worker encounters a task it can not decrypt, it will be discarded.
+    Tasks are encrypted. When a worker encounters a task it can not decrypt, it will be discarded or failed.
 
 workers
 ~~~~~~~

setup.py

@@ -26,7 +26,7 @@ class PyTest(Command):
 
 setup(
     name='django-q',
-    version='0.6.3',
+    version='0.6.4',
     author='Ilan Steemers',
     author_email='koed00@gmail.com',
     keywords='django task queue worker redis disque multiprocessing',