Colton Myers 2907a64052 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 ... Conflicts: salt/cli/batch.py salt/modules/git.py salt/utils/event.py		2015-08-20 13:31:46 -06:00
..
access_control.rst	Whitespace cleanup	2014-12-11 07:53:19 -08:00
index.rst	Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8	2015-08-20 13:31:46 -06:00