From: Colleen Murphy <cmurphy@users.noreply.github.com>
Date: Wed, 7 Jan 2015 20:33:13 +0000 (-0800)
Subject: Merge pull request #464 from mhaskel/MODULES-1612
X-Git-Tag: 1.4.0~17
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=741687e07d52e6cf217d803e61cb9d0bcd8491fa;p=puppet-modules%2Fpuppetlabs-firewall.git

Merge pull request #464 from mhaskel/MODULES-1612

MODULES-1612 - sync set_mark
---

741687e07d52e6cf217d803e61cb9d0bcd8491fa