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

Changelog

@@ -20,7 +20,7 @@
   ``taskset_id`` keyword argument (Issue #331).
 
 * The current taskset id (if any) is now available in the task context as
-  ``request.context`` (Issue #329).
+  ``request.taskset`` (Issue #329).
 
 * SQLAlchemy result backend: `date_done` was no longer part of the results as it had
   been accidentally removed.  It is now available again (Issue #325).

docs/tutorials/clickcounter.rst

@@ -21,7 +21,7 @@ So what can you do? In this tutorial we will send the individual clicks as
 messages using `kombu`, and then process them later with a Celery periodic
 task.
 
-Celery and Kombu is excellent in tandem, and while this might not be
+Celery and Kombu are excellent in tandem, and while this might not be
 the perfect example, you'll at least see one example how of they can be used
 to solve a task.