Colton Myers 9864d9e0fa Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop ... Conflicts: doc/ref/modules/all/index.rst doc/topics/releases/boron.rst salt/cli/daemons.py salt/cli/salt.py salt/modules/jboss7.py salt/states/file.py		2015-09-18 11:03:37 -06:00
..
dev.rst	Document develoment of SPM loader modules	2015-09-12 11:14:47 -06:00
index.rst	Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop	2015-09-18 11:03:37 -06:00