saltstack/salt — pull request #17304 by thatch45 (2014-11-10 16:11:11+00:00)
Title: Merge #17225

Merge #17225