From: Ashley Penney <ashley.penney@puppetlabs.com>
Date: Tue, 12 Aug 2014 16:48:44 +0000 (-0400)
Subject: Merge pull request #345 from mhaskel/merge_1.5.x_changes
X-Git-Tag: 1.6.0~2
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=239232bbd44c6dabc3f305bd23b354481d9f8a71;p=puppet-modules%2Fpuppetlabs-apt.git

Merge pull request #345 from mhaskel/merge_1.5.x_changes

Merge 1.5.x changes
---

239232bbd44c6dabc3f305bd23b354481d9f8a71