saltstack/salt — pull request #18259 by thatch45 (2014-11-19 16:46:03+00:00)
Title: Merge #18249 with fixes

Merge #18249 with fixes