fix bf903654f10
fixed error - timeout object has no attribute value
removed the try-except - added logger.error(str(e))
Merge pull request #758 from tfabbri/master

fixed error - timeout object has no attribute value
removed the try-except - added logger.error(str(e))

Conflicts:
	obspy/seedlink/client/seedlinkconnection.py
update credits
Merge remote-tracking branch 'upstream/releases'

Conflicts:
	misc/docs/source/credits.rst