Merge branch 'master' of github.com:brodriguesneto/puppet-apcupsd
Merge branch 'master' of github.com:brodriguesneto/puppet-apcupsd