Colton Myers 26b6c92975 Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop ... Conflicts: doc/conf.py salt/config/__init__.py salt/modules/rh_ip.py salt/pillar/s3.py salt/returners/local_cache.py salt/states/user.py salt/templates/rh_ip/rh7_eth.jinja		2015-09-17 11:10:37 -06:00
..
index.rst	Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop	2015-09-17 11:10:37 -06:00