Merge branch 'master' of git://labs.riseup.net/module_backupninja

Conflicts:
	manifests/rdiff.pp

diff --cc manifests/rdiff.pp
index 562d6520e4e277c685550b65d413dff50e0c0b7b,587c02dd65c83af31d75f2f4ecb46becece29735..f750e23aee5df01ff49e50d7424bf4ac5bd5b542
--- 1/manifests/rdiff.pp
--- 2/manifests/rdiff.pp
+++ b/manifests/rdiff.pp
@@@ -25,8 -25,7 +25,8 @@@ define backupninja::rdiff
                 "/home", "/usr/local/*bin", "/var/lib/dpkg/status*" ],
    $vsinclude = false, $keep = 30, $sshoptions = false, $options = '--force', $ssh_dir_manage = true,
    $ssh_dir = false, $authorized_keys_file = false, $installuser = true, $installkey = true, $key = false,
 -  $backuptag = false, $home = false, $backupkeytype = "rsa", $backupkeystore = false, $extras = false, $nagios2_description = 'backups')
 +  $backuptag = false, $home = false, $backupkeytype = "rsa", $backupkeystore = false, $extras = false,
-   $subfolder = 'rdiff-backup')
++  $nagios2_description = 'backups', $subfolder = 'rdiff-backup')
  {
    include backupninja::client::rdiff_backup