From: mh <mh@immerda.ch>
Date: Wed, 2 Jan 2013 18:46:18 +0000 (+0100)
Subject: Merge remote-tracking branch 'riseup/master'
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=3d2e75b8b438dff6f32ce22664b148b6a5ca365e;p=puppet-shorewall.git

Merge remote-tracking branch 'riseup/master'

Conflicts:
	files/shorewall.conf.CentOS.6
	files/shorewall.conf.Debian.wheezy
---

3d2e75b8b438dff6f32ce22664b148b6a5ca365e