From: Colleen Murphy <cmurphy@users.noreply.github.com>
Date: Tue, 28 Oct 2014 19:37:57 +0000 (-0700)
Subject: Merge pull request #380 from mhaskel/test
X-Git-Tag: 1.8.0~37
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=06cffcdd09bcf2e623db3160b29f77dc396c33d2;p=puppet-modules%2Fpuppetlabs-apt.git

Merge pull request #380 from mhaskel/test

merge 1.7.x into master
---

06cffcdd09bcf2e623db3160b29f77dc396c33d2