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

CONTRIBUTORS.txt

@@ -199,7 +199,6 @@ Krzysztof Bujniewicz, 2015/10/21
 Sukrit Khera, 2015/10/26
 Dave Smith, 2015/10/27
 Dennis Brakhane, 2015/10/30
-<<<<<<< HEAD
 Chris Harris, 2015/11/27
 Valentyn Klindukh, 2016/01/15
 Wayne Chang, 2016/01/15

celery/app/base.py

@@ -135,6 +135,9 @@ class Celery(object):
     :keyword autofinalize: If set to False a :exc:`RuntimeError`
         will be raised if the task registry or tasks are used before
         the app is finalized.
+    :keyword config_source: receives a class with class level attributes that
+        allows configurating Celery from a single object. All attributes
+        described in the documentation can be defined.
 
     """
     #: This is deprecated, use :meth:`reduce_keys` instead