Colton Myers c4f5e231fa Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop2 ... Conflicts: doc/_themes/saltstack2/layout.html doc/conf.py doc/index.rst doc/ref/modules/all/salt.modules.hipchat.rst doc/topics/releases/index.rst salt/client/ssh/client.py salt/cloud/clouds/vsphere.py salt/modules/boto_dynamodb.py salt/modules/boto_route53.py salt/modules/data.py salt/modules/http.py salt/modules/tls.py salt/output/compact.py salt/states/boto_elb.py salt/states/linux_acl.py salt/states/rabbitmq_user.py salt/states/win_servermanager.py salt/utils/dictupdate.py salt/wheel/config.py		2015-05-29 15:10:13 -06:00
..
buildenv	Adding missing .bat scripts for salt-master and friends	2015-05-15 20:14:32 -05:00
installer	Unset PYTHONHOME when starting the service	2015-05-29 15:28:35 +01:00
BuildSalt.bat	Added ability to send a version with a space in it	2015-04-20 21:55:57 +00:00
portable.py	Fixed problem with pip not working on portable install	2015-04-06 23:04:24 +00:00