Merge branch '3.0'

Conflicts:
	requirements/default-py3k.txt
	requirements/default.txt
	setup.cfg

Changelog

@@ -26,7 +26,7 @@ If you're looking for versions prior to 3.x you should see :ref:`history`.
 ======
 :release-date: TBA
 
-- Now depends on kombu 2.4.6
+- Now depends on kombu 2.4.7
 
 - Now depends on billiard 2.7.3.13
 
@@ -70,6 +70,11 @@ If you're looking for versions prior to 3.x you should see :ref:`history`.
 
 - The repr of a crontab schedule value of '0' should be '*'  (Issue #972).
 
+- Revoked tasks are now removed from reserved/active state in the worker
+  (Issue #969)
+
+    Fix contributed by Alexey Zatelepin.
+
 - gevent: Now supports hard time limits using ``gevent.Timeout`.
 
 3.0.9

requirements/default.txt

@@ -1,3 +1,3 @@
 pytz
 billiard>=2.7.3.13
-kombu>=2.4.6,<3.0
+kombu>=2.4.7,<3.0

setup.cfg

@@ -16,4 +16,4 @@ upload-dir = docs/.build/html
 [bdist_rpm]
 requires = pytz
            billiard>=2.7.3.13
-           kombu >= 2.4.6
+           kombu >= 2.4.7