From: Micah <micah@riseup.net>
Date: Wed, 9 Dec 2015 14:41:31 +0000 (+0000)
Subject: Merge branch 'immerda_changes' into 'master'
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=edd5db0159d5075609c545fb3ee10727a1cf5271;p=puppet-shorewall.git

Merge branch 'immerda_changes' into 'master'

Immerda changes



See merge request !5
---

edd5db0159d5075609c545fb3ee10727a1cf5271