saltstack/salt — pull request #2754 by profitware (2012-11-30 03:12:32+00:00)
Title: Some minor fixes

1. Fix in launchctl.py module: not using user 'marca' by default.
2. Fix in client.py: default master config is located at /etc/salt/master by default: http://docs.saltstack.org/en/latest/ref/configuration/master.html