From: Hunter Haugen <hunter@puppetlabs.com>
Date: Thu, 3 Jul 2014 17:10:10 +0000 (-0700)
Subject: Merge pull request #325 from apenney/merge
X-Git-Tag: 1.6.0~14
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=b764779fa4b1616fb480c3e91df2737ac5b1faab;hp=3c48598eebbd3d62bcec69893b652dc0b71cecb7;p=puppet-modules%2Fpuppetlabs-apt.git

Merge pull request #325 from apenney/merge

Merge
---