From: Colleen Murphy <cmurphy@users.noreply.github.com>
Date: Tue, 27 Jan 2015 19:43:37 +0000 (-0800)
Subject: Merge pull request #485 from mhaskel/merge_1.4.x_to_master
X-Git-Tag: 1.5.0~13
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=2f7b30cec37288742e552db4abfbf9bb7c4f01a2;p=puppet-modules%2Fpuppetlabs-firewall.git

Merge pull request #485 from mhaskel/merge_1.4.x_to_master

Merge 1.4.x to master
---

2f7b30cec37288742e552db4abfbf9bb7c4f01a2