From: Hunter Haugen <hunter@puppetlabs.com>
Date: Wed, 26 Feb 2014 22:13:57 +0000 (-0800)
Subject: Merge branch '1.4.x'
X-Git-Tag: 1.5.0~32
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=fd3e07e58fadc6efb25d524168575c39de0c5590;p=puppet-modules%2Fpuppetlabs-apt.git

Merge branch '1.4.x'
---

fd3e07e58fadc6efb25d524168575c39de0c5590