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
..
raet	Fixes for doc build errors	2015-05-27 11:40:31 -06:00
index.rst	typo fixing!	2015-04-08 09:15:50 -07:00
tcp.rst	Fixing more sphinx/docs errors and warnings	2015-05-16 19:24:04 -04:00
zeromq.rst	Add initial transport docs	2015-04-08 09:08:13 -07:00