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

Merge branch '1.4.x'
---

a2505b6e6646a29842ff47832089acd85da8684f