Adds IconsistencyError to Redis connection_errors
Redis: Adds transport option: socket_timeout.  Closes celery/celery#1221
Merge branch 'master' of github.com:celery/kombu
Redis: Adds transport option: socket_timeout.  Closes celery/celery#1221
Merge branch '2.5' of github.com:celery/kombu into 2.5
Redis: Did not take options from transport_options
Now depends on amqp 1.0.9
ssl option added to transport mongodb transport
Bumps version to 2.5.7
Adds IconsistencyError to Redis connection_errors
Updates Changelog for 2.5.7
docstring
Use get_errno
Adds Ephemera to AUTHORS
Merge branch '2.5'

Conflicts:
	README.rst
	kombu/__init__.py
	kombu/connection.py
	kombu/transport/redis.py
	requirements/default.txt
Moved eventio.get_errno to utils.compat.get_errno
Merge branch '2.5'

Conflicts:
	kombu/connection.py