]> gitweb.fluxo.info Git - puppet-apt.git/commitdiff
projects / puppet-apt.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9b916b3 dd36612)
Merge remote branch 'immerda/master'
authorMicah Anderson <micah@riseup.net>
Thu, 2 Sep 2010 23:12:58 +0000 (19:12 -0400)
committerMicah Anderson <micah@riseup.net>
Thu, 2 Sep 2010 23:12:58 +0000 (19:12 -0400)
Conflicts:
manifests/init.pp

1  2 
README patch | diff1 | diff2 | blob | history

diff --cc README
Simple merge
Puppet module for apt