From: Hunter Haugen <hunter@puppetlabs.com>
Date: Tue, 4 Mar 2014 16:38:35 +0000 (-0800)
Subject: Merge remote-tracking branch 'apenney/102-release' into 1.0.x
X-Git-Tag: 1.0.2^0
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=refs%2Fheads%2F1.0.x;p=puppet-modules%2Fpuppetlabs-firewall.git

Merge remote-tracking branch 'apenney/102-release' into 1.0.x
---

48bb506853b3364969a6148e26861302872d1c31