Merge branch 'master' of github.com:evolvingweb/puppet-apt