Removes duplicate
Merge branch '2.5'
Merge branch 'master' of github.com:celery/kombu