Colton Myers 1d77ae9072 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop ... Conflicts: salt/cloud/clouds/ec2.py salt/modules/hipchat.py salt/modules/random_org.py salt/modules/serverdensity_device.py salt/modules/slack_notify.py salt/returners/__init__.py salt/states/iptables.py		2015-05-11 11:38:03 -06:00
..
index.rst	Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop	2015-05-11 11:38:03 -06:00