From: Ashley Penney <ashley.penney@puppetlabs.com>
Date: Wed, 14 May 2014 17:17:19 +0000 (-0400)
Subject: Merge branch '1.4.x' into 14x-merge
X-Git-Tag: 1.5.0~7^2
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=7492f375fe3ea625e71673eaddcd1e11f06aca40;p=puppet-modules%2Fpuppetlabs-apt.git

Merge branch '1.4.x' into 14x-merge
---

7492f375fe3ea625e71673eaddcd1e11f06aca40