Fix regression for django.db.transaction.managed
Use celery.app package instead of deprecated celery.task.
Heads up that task.delay() returns None, not AsyncResult.
Add syntax highlighting
Merge remote-tracking branch 'ticosax/fix-regression'
Merge remote-tracking branch 'fladi/celery-3.x'
Merge remote-tracking branch 'fladi/asyncresult-not-returned'
Merge remote-tracking branch '10to8/master'

Conflicts:
	djcelery_transactions/__init__.py
Merge remote-tracking branch 'fellowshipofone/master'

Conflicts:
	djcelery_transactions/__init__.py
We don't want tasks to get fired off during inner savepoint commits -- only when the parent transaction is committed.
Need to honor CELERY_ALWAYS_EAGER here too
Looks like you only need djcelery to run tests, so install it if you're going to run tests.  But I'd rather not have it installed if we don't need it.
Merge branch 'master' of github.com:clearcare/django-celery-transactions into clearcare-master

Conflicts:
	djcelery_transactions/__init__.py
Merge branch 'clearcare-master' into unify-releases
New setting CELERY_EAGER_TRANSACTION
Update AUTHORS
Fix eager_transaction
Merge branch 'master' of github.com:brycedrennan/django-celery-transactions into brycedrennan-master

Conflicts:
	README.md
	djcelery_transactions/__init__.py
	tests/tests.py
Merge branch 'brycedrennan-master' into unify-releases
Update AUTHORS after merge