From: Hunter Haugen <hunter@puppetlabs.com>
Date: Wed, 11 Jun 2014 18:04:58 +0000 (-0700)
Subject: Merge branch 'MFredette'
X-Git-Tag: 1.3.0~1^2~33
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=cf786dcc5bee4277fc5244ab190364953bbe4f85;p=puppet-modules%2Fpuppetlabs-firewall.git

Merge branch 'MFredette'
---

cf786dcc5bee4277fc5244ab190364953bbe4f85