Colton Myers 17b919e9ec Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop ... Conflicts: doc/topics/eauth/access_control.rst salt/modules/state.py salt/state.py salt/states/boto_secgroup.py tests/unit/modules/state_test.py		2016-01-07 16:36:40 -07:00
..
access_control.rst	Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop	2016-01-07 16:36:40 -07:00
index.rst	Update index.rst	2015-12-28 10:47:40 -07:00