Colton Myers e29be766bb Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 ... Conflicts: debian/changelog doc/man/salt.7 salt/cloud/__init__.py salt/cloud/clouds/proxmox.py salt/cloud/clouds/vmware.py salt/config.py salt/fileclient.py salt/minion.py salt/modules/chocolatey.py salt/modules/localemod.py salt/modules/pacman.py salt/modules/pkgng.py salt/modules/schedule.py salt/modules/state.py salt/modules/win_file.py salt/modules/win_pkg.py salt/state.py salt/states/file.py salt/utils/args.py tests/unit/states/file_test.py		2015-07-30 16:54:44 -06:00
..
index.rst	Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8	2015-07-30 16:54:44 -06:00