saltstack/salt — pull request #12324 by jacksontj (2014-04-26 21:30:11+00:00)
Title: Misc cleanup

Lots of conditionals, but only 2 return options. Just simplifying life :)