saltstack/salt — pull request #18102 by thatch45 (2014-11-14 20:52:50+00:00)
Title: Merge #17282 with fixes

Merge #17282 with fixes