From: Morgan Haskel <morgan@puppetlabs.com>
Date: Fri, 25 Jul 2014 15:53:53 +0000 (-0400)
Subject: Merge remote-tracking branch 'upstream/1.5.x'
X-Git-Tag: 1.6.0~10^2
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=23149c9a3a25b347cebcc70c5c501b02709ce69a;p=puppet-modules%2Fpuppetlabs-apt.git

Merge remote-tracking branch 'upstream/1.5.x'
---

23149c9a3a25b347cebcc70c5c501b02709ce69a