rallytime 7554d0f42d Merge branch '2015.5' into '2015.8' ... Conflicts: - doc/ref/states/include.rst - doc/topics/cloud/reactor.rst - doc/topics/reactor/index.rst - doc/topics/releases/2015.5.10.rst - doc/topics/tutorials/states_pt5.rst - doc/topics/windows/windows-package-manager.rst - salt/config.py - salt/modules/state.py - salt/states/grains.py - tests/integration/modules/sysmod.py - tests/unit/states/grains_test.py		2016-03-24 15:48:00 -06:00
..
index.rst	Merge branch '2015.5' into '2015.8'	2016-03-24 15:48:00 -06:00