From: Ken Barber <ken@bob.sh>
Date: Tue, 22 Nov 2011 10:57:13 +0000 (+0000)
Subject: Merge branch 'ticket/10997-ipencap'
X-Git-Tag: v0.0.4~8
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=c862126abded0a9db93d2760502736cb8a8b8e6f;p=puppet-modules%2Fpuppetlabs-firewall.git

Merge branch 'ticket/10997-ipencap'

* ticket/10997-ipencap:
  (#10997) Add ipencap (protocol 4) support to firewall type property 'proto'
---

c862126abded0a9db93d2760502736cb8a8b8e6f