]> gitweb.fluxo.info Git - puppet-apt.git/commitdiff
Merge branch 'master' of code.leap.se:puppet_apt into nadir_master
authorvarac <varacanero@zeromail.org>
Sun, 14 Apr 2013 11:25:21 +0000 (13:25 +0200)
committervarac <varacanero@zeromail.org>
Sun, 14 Apr 2013 11:25:21 +0000 (13:25 +0200)
1  2 
manifests/init.pp

Simple merge