saltstack/salt — pull request #18768 by basepi (2014-12-05 18:01:34+00:00)
Title: Merge forward from 2014.7 to develop

Merge forward from 2014.7 to develop