From: Morgan Haskel <morgan@puppetlabs.com>
Date: Mon, 15 Sep 2014 21:27:27 +0000 (-0700)
Subject: Merge pull request #360 from mhaskel/test
X-Git-Tag: 1.7.0~7
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=622a05ab88fd6bf9c3310294f45bbf9a6e95d3ac;p=puppet-modules%2Fpuppetlabs-apt.git

Merge pull request #360 from mhaskel/test

Merge 1.6.x into master
---

622a05ab88fd6bf9c3310294f45bbf9a6e95d3ac