]> gitweb.fluxo.info Git - puppet-shorewall.git/commitdiff
projects / puppet-shorewall.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7e59740 b2499eb)
Merge remote-tracking branch 'immerda/master'
authorintrigeri <intrigeri@boum.org>
Sun, 30 Dec 2012 13:40:44 +0000 (14:40 +0100)
committerintrigeri <intrigeri@boum.org>
Sun, 30 Dec 2012 13:40:44 +0000 (14:40 +0100)

Trivial merge
Puppet module for shorewall