From: Morgan Haskel <morgan@puppetlabs.com>
Date: Tue, 31 Mar 2015 20:32:56 +0000 (-0400)
Subject: Merge pull request #511 from puppetlabs/1.5.x
X-Git-Tag: 1.6.0~19
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=6f11e32b9132bafb01975bb45808672b1717f0cb;p=puppet-modules%2Fpuppetlabs-firewall.git

Merge pull request #511 from puppetlabs/1.5.x

Merge 1.5.0 back to master
---

6f11e32b9132bafb01975bb45808672b1717f0cb