saltstack/salt — pull request #18437 by thatch45 (2014-11-24 18:33:33+00:00)
Title: Merge #18396

Merge #18396