From: Travis Fields <cyberious@users.noreply.github.com>
Date: Tue, 4 Nov 2014 23:16:16 +0000 (-0800)
Subject: Merge pull request #432 from mhaskel/test
X-Git-Tag: 1.3.0~10
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=6b308177c3d279083078955942969c92b145eba0;p=puppet-modules%2Fpuppetlabs-firewall.git

Merge pull request #432 from mhaskel/test

Merge 1.2.x into master
---

6b308177c3d279083078955942969c92b145eba0