From: intrigeri <intrigeri@boum.org>
Date: Sun, 11 Nov 2012 22:10:20 +0000 (+0100)
Subject: Merge remote-tracking branch 'riseup/master' into tmp
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=8080f1a892a69dc171187c8165d7e81f5b5b512d;p=puppet-shorewall.git

Merge remote-tracking branch 'riseup/master' into tmp

Conflicts:
	manifests/init.pp
---

8080f1a892a69dc171187c8165d7e81f5b5b512d