From: Ashley Penney <ashley.penney@puppetlabs.com>
Date: Thu, 15 May 2014 19:57:07 +0000 (-0400)
Subject: Merge branch 'master' into 1.2.x
X-Git-Tag: 1.1.2~4
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=4900b5bfc4e0a8daa9c0f73f247b2587e4dc0b72;p=puppet-modules%2Fpuppetlabs-firewall.git

Merge branch 'master' into 1.2.x
---

4900b5bfc4e0a8daa9c0f73f247b2587e4dc0b72