]> gitweb.fluxo.info Git - puppet-shorewall.git/commitdiff
projects / puppet-shorewall.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1a7d66e bcded0b)
Merge remote-tracking branch 'immerda/master'
authorintrigeri <intrigeri@boum.org>
Wed, 2 Jan 2013 16:59:32 +0000 (17:59 +0100)
committerintrigeri <intrigeri@boum.org>
Wed, 2 Jan 2013 16:59:32 +0000 (17:59 +0100)

Trivial merge
Puppet module for shorewall