From: Hunter Haugen <hunter@puppetlabs.com>
Date: Wed, 9 Jul 2014 20:46:32 +0000 (-0700)
Subject: Merge branch '1.2.x' into master
X-Git-Tag: 1.3.0~1^2~29
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=308f81ea547a1e7be041f71ae17ccd349b00d14e;p=puppet-modules%2Fpuppetlabs-firewall.git

Merge branch '1.2.x' into master

Conflicts:
	CHANGELOG.md
	Gemfile
	Modulefile
	metadata.json
---

308f81ea547a1e7be041f71ae17ccd349b00d14e