From: Colleen Murphy <cmurphy@users.noreply.github.com>
Date: Fri, 31 Oct 2014 23:18:03 +0000 (-0700)
Subject: Merge pull request #430 from mhaskel/1.2.0-prep
X-Git-Tag: 1.3.0~11
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=5da0edb4149dc78e7a6408791aeeeb9d823550e5;p=puppet-modules%2Fpuppetlabs-firewall.git

Merge pull request #430 from mhaskel/1.2.0-prep

1.2.0 prep
---

5da0edb4149dc78e7a6408791aeeeb9d823550e5