Merge remote-tracking branch 'lelutin/master'

Conflicts:
	manifests/init.pp

diff --cc manifests/init.pp
index 5374ba59129bbce6cbb001911658165f7fbc3957,9c963f6eeaeaa990f8210205a99a56a2b3446089..06c0d02cd269ff2cc6444ee493287e70ac75f3b4
--- 1/manifests/init.pp
--- 2/manifests/init.pp
+++ b/manifests/init.pp
@@@ -22,10 -22,9 +22,12 @@@ class apcupsd
    $device = '/dev/ttyS0',
    $ensure = 'present',
    $nisip = '127.0.0.1',
-   $polltime = '60',
 +  $onbatterydelay = '6',
 +  $batterylevel = '5',
 +  $minutes = '3')
+   $admin = 'root',
+   $mail = 'mail',
+   $polltime = '60' )
  {
  
    package { "apcupsd":