From: Ashley Penney <ashley.penney@puppetlabs.com>
Date: Fri, 25 Jul 2014 15:56:43 +0000 (-0400)
Subject: Merge pull request #334 from mhaskel/1.5.x-merge
X-Git-Tag: 1.6.0~10
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=3a2fe3b1aef33515652a6810365e59b7f3ee0c29;p=puppet-modules%2Fpuppetlabs-apt.git

Merge pull request #334 from mhaskel/1.5.x-merge

1.5.x merge
---

3a2fe3b1aef33515652a6810365e59b7f3ee0c29