From: Hunter Haugen <hunter@puppetlabs.com>
Date: Tue, 4 Mar 2014 21:57:39 +0000 (-0800)
Subject: Merge branch '1.0.x'
X-Git-Tag: 1.1.0~10
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=1513dda7ef6da48555f98a7483881022502dcdfc;p=puppet-modules%2Fpuppetlabs-firewall.git

Merge branch '1.0.x'
---

1513dda7ef6da48555f98a7483881022502dcdfc