From: intrigeri <intrigeri@boum.org>
Date: Sun, 30 Dec 2012 13:40:44 +0000 (+0100)
Subject: Merge remote-tracking branch 'immerda/master'
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=1a7d66e160077f625fd86d21b3566dcb489a0d54;p=puppet-shorewall.git

Merge remote-tracking branch 'immerda/master'
---

1a7d66e160077f625fd86d21b3566dcb489a0d54