Merge branch 'master' of https://github.com/nlaplante/syslogng-web.git
Merge branch 'master' of https://github.com/nlaplante/syslogng-web.git