saltstack/salt — pull request #4559 by s0undt3ch (2013-04-22 18:39:54+00:00)
Title: Fix travis again

This seems to fix #1935. It also fixes the issue we had in which the test-suite would not finish properly it would just hang.