Merge branch 'master' of github.com:loggly/install-script into add-tag
f23cabc
Conflicts: configure-syslog.py