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

diff --cc manifests/unattended_upgrades.pp
index 1732fe2b394dd30ef5e43e36c98bc4af35c1f318,34d4d31bcc8f9a66122e79613225a735060a3007..23d9bd73bc4d5cb311b64758cf3f68072711a0b4
--- 1/manifests/unattended_upgrades.pp
--- 2/manifests/unattended_upgrades.pp
+++ b/manifests/unattended_upgrades.pp
@@@ -15,18 -15,7 +15,18 @@@ class apt::unattended_upgrades 
  
    if $custom_preferences != false {
      Apt_conf["50unattended-upgrades"] {
-       before => Concatenated_file[apt_config],
+       before => Concat[apt_config],
      }
    }
 +
 +  if $operatingsystem == 'ubuntu' {
 +    file { '/etc/apt/apt.conf.d/10periodic':
 +      ensure  => present,
 +      owner   => root,
 +      group   => root,
 +      mode    => 0644,
 +      source  => 'puppet:///modules/apt/10periodic',
 +      require => Package['unattended-upgrades'],
 +    }
 +  }
  }