saltstack/salt — pull request #9661 by s0undt3ch (2014-01-09 23:45:09+00:00)
Title: DO NOT MERGE

DO NOT MERGE