Colton Myers 9e9a2eab90 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 ... Conflicts: salt/fileserver/gitfs.py salt/loader.py		2015-01-23 16:13:30 -07:00
..
batch.rst	Whitespace cleanup	2014-12-11 07:53:19 -08:00
compound.rst	Whitespace cleanup	2014-12-11 07:53:19 -08:00
globbing.rst	Whitespace cleanup	2014-12-11 07:53:19 -08:00
grains.rst	Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2	2015-01-23 16:13:30 -07:00
index.rst	Whitespace cleanup	2014-12-11 07:53:19 -08:00
ipcidr.rst	Whitespace cleanup	2014-12-11 07:53:19 -08:00
nodegroups.rst	Whitespace cleanup	2014-12-11 07:53:19 -08:00
range.rst	Comma cleanup	2014-12-12 11:39:55 -08:00