From: Hunter Haugen <hunter@puppetlabs.com>
Date: Wed, 23 Jul 2014 00:06:48 +0000 (-0700)
Subject: Merge branch '1.2.x'
X-Git-Tag: 1.3.0~1^2~27
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=f4c72d2e7df3d7c4f2c0cc23e12fcb51f2dff4f3;p=puppet-modules%2Fpuppetlabs-firewall.git

Merge branch '1.2.x'
---

f4c72d2e7df3d7c4f2c0cc23e12fcb51f2dff4f3