From: Travis Fields <cyberious@users.noreply.github.com>
Date: Mon, 3 Nov 2014 21:11:56 +0000 (-0800)
Subject: Merge pull request #431 from mhaskel/1.2.0-prep
X-Git-Tag: 1.2.0^0
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=ec940cff5ba4640c43e1cdfd46891a519f94c7c3;p=puppet-modules%2Fpuppetlabs-firewall.git

Merge pull request #431 from mhaskel/1.2.0-prep

1.2.0 prep
---

ec940cff5ba4640c43e1cdfd46891a519f94c7c3