saltstack/salt — pull request #2093 by bendavis78 (2012-09-25 23:21:15+00:00)
Title: Fixed support for YAML "<<" merge operator

Fixes #2092