saltstack/salt — pull request #18623 by basepi (2014-12-01 22:04:55+00:00)
Title: Merge forward from 2014.7 to develop

Merge forward from 2014.7 to develop