saltstack/salt — pull request #18956 by thatch45 (2014-12-12 16:57:54+00:00)
Title: Merge forward 2014.7

Merge forward 2014.7