saltstack/salt-cloud — pull request #685 by mafrosis (2013-07-17 23:24:38+00:00)
Title: Grains n maps

- fixed a bug in the recent refactor of grains into their own file
- merge grains from a map file with the grains defined in the profile - rather than overwriting them