Fixed unbound reference error "client"
Merge branch 'master' of github.com:celery/kombu
Implements collect for pyamqp transport.  Closes celery/celery#2312
Fixes app_label for old Django versions.  Closes #414

Conflicts:
	kombu/transport/django/models.py