]> gitweb.fluxo.info Git - puppet-apt.git/commitdiff
projects / puppet-apt.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b9d11f1 045e1fc)
Merge branch 'master' of git://labs.riseup.net/shared-apt
authorSilvio Rhatto <rhatto@riseup.net>
Mon, 14 Feb 2011 16:11:19 +0000 (14:11 -0200)
committerSilvio Rhatto <rhatto@riseup.net>
Mon, 14 Feb 2011 16:11:19 +0000 (14:11 -0200)
Conflicts:
manifests/init.pp
templates/sources.list.backports.erb


Trivial merge
Puppet module for apt