From: intrigeri <intrigeri@boum.org>
Date: Wed, 2 Jan 2013 16:59:32 +0000 (+0100)
Subject: Merge remote-tracking branch 'immerda/master'
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=c725e8bfb1026f7d59ea1d825c8dfcee02952ee8;p=puppet-shorewall.git

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

c725e8bfb1026f7d59ea1d825c8dfcee02952ee8