saltstack/salt — pull request #11739 by techhat (2014-04-02 23:53:47+00:00)
Title: Add timeout back into s3 connection

Fixes #11735.