saltstack/salt — pull request #6639 by s0undt3ch (2013-08-12 12:58:40+00:00)
Title: Unit test fixes.

@basepi, this needs cherry-pickin'