Colton Myers a5c9681672 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop ... Conflicts: doc/topics/releases/version_numbers.rst salt/cli/batch.py salt/minion.py salt/state.py setup.py		2015-06-18 11:43:11 -06:00
..
logging	clarify and expand console log colors help	2015-03-26 23:21:30 -06:00
examples.rst	Whitespace cleanup	2014-12-11 07:53:20 -08:00
index.rst	Comma cleanup	2014-12-12 11:34:34 -08:00
master.rst	Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop	2015-06-18 11:43:11 -06:00
minion.rst	Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop	2015-06-18 11:43:11 -06:00
nonroot.rst	Comma cleanup	2014-12-12 11:34:34 -08:00