From: Silvio Rhatto <rhatto@riseup.net>
Date: Wed, 23 Mar 2016 23:01:11 +0000 (-0300)
Subject: Merge remote-tracking branch 'shared/master' into develop
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=HEAD;p=puppet-shorewall.git

Merge remote-tracking branch 'shared/master' into develop

Conflicts:
	manifests/tunnel.pp
---

dffe0d74eadc7c25ab9ee513cb3a6b345dfa7644