saltstack/salt — pull request #6032 by terminalmage (2013-07-08 04:25:16+00:00)
Title: Document defining custom grains in /etc/salt/grains

Fixes #6000.
Fixes #6001.