Colton Myers 94d6ef1d17 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop ... Conflicts: doc/ref/modules/all/salt.modules.ipmi.rst doc/ref/states/all/salt.states.tls.rst doc/topics/cloud/index.rst doc/topics/cloud/vsphere.rst doc/topics/eauth/index.rst salt/cli/batch.py salt/modules/cmdmod.py salt/modules/ipmi.py salt/netapi/rest_cherrypy/app.py salt/runners/http.py salt/states/boto_elb.py salt/states/dockerio.py salt/states/linux_acl.py salt/states/win_servermanager.py salt/wheel/config.py		2015-06-09 11:41:07 -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-develop	2015-06-09 11:41:07 -06:00