Merge branch 'issue-23125' of github.com:msteed/salt into issue-23125

This commit is contained in:
Michael Steed 2015-09-07 16:06:01 -06:00
commit bc041fa4a7

Diff content is not available