From: Ashley Penney <ashley.penney@puppetlabs.com>
Date: Fri, 8 Aug 2014 15:37:33 +0000 (-0400)
Subject: Merge pull request #340 from mhaskel/1.5.3-backports
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=159f84deaf978f67d08c0c6345be3dbb75a9cab5;p=puppet-modules%2Fpuppetlabs-apt.git

Merge pull request #340 from mhaskel/1.5.3-backports

1.5.3 backports
---

159f84deaf978f67d08c0c6345be3dbb75a9cab5