]> gitweb.fluxo.info Git - puppet-shorewall.git/commitdiff
projects / puppet-shorewall.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 911cc18 5052233)
Merge remote-tracking branch 'riseup/master' into tmp
authorintrigeri <intrigeri@boum.org>
Sun, 11 Nov 2012 22:10:20 +0000 (23:10 +0100)
committerintrigeri <intrigeri@boum.org>
Sun, 11 Nov 2012 22:10:20 +0000 (23:10 +0100)
Conflicts:
manifests/init.pp


Trivial merge
Puppet module for shorewall