saltstack/salt — pull request #12543 by cachedout (2014-05-05 16:32:14+00:00)
Title: 11877

Closes #11877.

(Let tests run before merge, please.)