Merge branch '2.5'

Conflicts:
	pavement.py

1 files changed, 5 insertions, 4 deletions

diff --git a/examples/simple_task_queue/client.py b/examples/simple_task_queue/client.py
index 8ed33f36..8cad069e 100644
--- a/examples/simple_task_queue/client.py
+++ b/examples/simple_task_queue/client.py
@@ -14,10 +14,11 @@ def send_as_task(connection, fun, args=(), kwargs={}, priority='mid'):
 
     with producers[connection].acquire(block=True) as producer:
         maybe_declare(task_exchange, producer.channel)
-        producer.publish(payload, serializer='pickle',
-                                  compression='bzip2',
-                                  exchange=task_exchange,
-                                  routing_key=routing_key)
+        producer.publish(payload,
+                         serializer='pickle',
+                         compression='bzip2',
+                         exchange=task_exchange,
+                         routing_key=routing_key)
 
 if __name__ == '__main__':
     from kombu import Connection