Docs: Improvements to example configuration file /etc/default/celeryd.
Django: Child processes must call django.setup if on Windows (Issue #2126)
Cosmetics
AMQP result backend: Call on_interval every second (always) to propagate parent errors
Merge pull request #2191 from tjanez/improve_example_conf

Docs: Improvements to example configuration file /etc/default/celeryd.
Py3: tests should not depend on mock
Tox: pypy3 must use test3.txt, not test.txt
Merge branch 'master' of github.com:celery/celery
Task: Do not raise retry exception when retry executed in eager mode.  Partially fixes #2164
Fixes tests on py3
Added logging example to redirect stdouts to custom logger in task
Worker: autoreload should ignore not implemented pool.restart.  Closes #2153
Sphinx extension resolved to celery.attr instead of app.attr, also faq referred to outdated celery.execute module