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

Conflicts:
	manifests/init.pp
Merge branch 'master' of github.com:brodriguesneto/puppet-apcupsd