Colton Myers 124ad51c40 Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop ... Conflicts: doc/ref/index.rst doc/topics/eauth/index.rst salt/beacons/__init__.py salt/beacons/service.py salt/loader.py salt/minion.py salt/output/nested.py		2015-03-30 15:10:17 -06:00
..
access_control.rst	Whitespace cleanup	2014-12-11 07:53:19 -08:00
index.rst	Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop	2015-03-30 15:10:17 -06:00