Colton Myers 35425b14ad Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 ... Conflicts: doc/man/salt-api.1 doc/man/salt-call.1 doc/man/salt-cloud.1 doc/man/salt-cp.1 doc/man/salt-key.1 doc/man/salt-master.1 doc/man/salt-minion.1 doc/man/salt-run.1 doc/man/salt-ssh.1 doc/man/salt-syndic.1 doc/man/salt-unity.1 doc/man/salt.1 doc/man/salt.7 salt/modules/pip.py salt/states/user.py		2015-10-07 12:06:12 -06:00
..
index.rst	Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8	2015-10-07 12:06:12 -06:00