Colton Myers 6d503c12ea Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop ... Conflicts: doc/ref/modules/all/salt.modules.ipmi.rst doc/ref/modules/all/salt.modules.system_profiler.rst salt/fileclient.py salt/loader.py salt/modules/tls.py salt/modules/win_path.py salt/states/pkg.py salt/utils/event.py salt/utils/pagerduty.py tests/unit/modules/seed_test.py		2015-06-05 13:03:48 -06:00
..
saltstack	Fixing sphinx errors and warnings	2015-05-18 12:12:07 -04:00
saltstack2	Salt cloud doc updates, build errors and bug fixes	2015-06-04 16:42:47 -06:00