saltstack/salt — pull request #6727 by terminalmage (2013-08-15 18:27:45+00:00)
Title: Fix travis breakage

Fixes #6722.