• Merge branch 'master' of github.com:loggly/install-script into add-tag 

    Conflicts:
	configure-syslog.py
    ♥ Ivan Tam ♥
    ♥ Ivan Tam ♥ committed Aug 31, 2013
    f23cabc