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

Signed-off-by: Boaventura Rodrigues Neto <brodriguesneto@gmail.com>
Merge branch 'master' of ssh://git@github.com/brodriguesneto/puppet-apcupsd.git